diff --git a/hs_err_pid10014.log b/hs_err_pid10014.log new file mode 100644 index 000000000..23f0a440d --- /dev/null +++ b/hs_err_pid10014.log @@ -0,0 +1,709 @@ +# +# There is insufficient memory for the Java Runtime Environment to continue. +# Native memory allocation (mmap) failed to map 351272960 bytes for committing reserved memory. +# Possible reasons: +# The system is out of physical RAM or swap space +# In 32 bit mode, the process size limit was hit +# Possible solutions: +# Reduce memory load on the system +# Increase physical memory or swap space +# Check if swap backing store is full +# Use 64 bit Java on a 64 bit OS +# Decrease Java heap size (-Xmx/-Xms) +# Decrease number of Java threads +# Decrease Java thread stack sizes (-Xss) +# Set larger code cache with -XX:ReservedCodeCacheSize= +# This output file may be truncated or incomplete. +# +# Out of Memory Error (os_linux.cpp:2640), pid=10014, tid=0x00007faffe59d700 +# +# JRE version: Java(TM) SE Runtime Environment (8.0_161-b12) (build 1.8.0_161-b12) +# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.161-b12 mixed mode linux-amd64 compressed oops) +# Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again +# + +--------------- T H R E A D --------------- + +Current thread (0x00007fb014142800): VMThread [stack: 0x00007faffe49d000,0x00007faffe59e000] [id=10020] + +Stack: [0x00007faffe49d000,0x00007faffe59e000], sp=0x00007faffe59c220, free space=1020k +Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) +V [libjvm.so+0xacf94a] VMError::report_and_die()+0x2ba +V [libjvm.so+0x50050b] report_vm_out_of_memory(char const*, int, unsigned long, VMErrorType, char const*)+0x8b +V [libjvm.so+0x92b133] os::Linux::commit_memory_impl(char*, unsigned long, bool)+0x103 +V [libjvm.so+0x92b5c9] os::pd_commit_memory(char*, unsigned long, unsigned long, bool)+0x29 +V [libjvm.so+0x924c0a] os::commit_memory(char*, unsigned long, unsigned long, bool)+0x2a +V [libjvm.so+0x99ab53] PSVirtualSpace::expand_by(unsigned long)+0x53 +V [libjvm.so+0x99bf58] PSYoungGen::resize_generation(unsigned long, unsigned long)+0xf8 +V [libjvm.so+0x99b0b2] PSYoungGen::resize(unsigned long, unsigned long)+0x22 +V [libjvm.so+0x99838b] PSScavenge::invoke_no_policy()+0xf3b +V [libjvm.so+0x998b11] PSScavenge::invoke()+0x41 +V [libjvm.so+0x94f5a0] ParallelScavengeHeap::failed_mem_allocate(unsigned long)+0x70 +V [libjvm.so+0xad13c7] VM_ParallelGCFailedAllocation::doit()+0x97 +V [libjvm.so+0xad8ed5] VM_Operation::evaluate()+0x55 +V [libjvm.so+0xad729a] VMThread::evaluate_operation(VM_Operation*)+0xba +V [libjvm.so+0xad761e] VMThread::loop()+0x1ce +V [libjvm.so+0xad7a90] VMThread::run()+0x70 +V [libjvm.so+0x92da28] java_start(Thread*)+0x108 + +VM_Operation (0x00007faffc48dfe0): ParallelGCFailedAllocation, mode: safepoint, requested by thread 0x00007fb0142b3000 + + +--------------- P R O C E S S --------------- + +Java Threads: ( => current thread ) + 0x00007fb0142cd800 JavaThread "pool-1-thread-20" [_thread_blocked, id=10048, stack(0x00007faff73f4000,0x00007faff74f5000)] + 0x00007fb0142cb800 JavaThread "pool-1-thread-19" [_thread_blocked, id=10047, stack(0x00007faff74f5000,0x00007faff75f6000)] + 0x00007fb0142ca000 JavaThread "pool-1-thread-18" [_thread_blocked, id=10046, stack(0x00007faff75f6000,0x00007faff76f7000)] + 0x00007fb0142c8800 JavaThread "pool-1-thread-17" [_thread_blocked, id=10045, stack(0x00007faff76f7000,0x00007faff77f8000)] + 0x00007fb0142c6800 JavaThread "pool-1-thread-16" [_thread_blocked, id=10044, stack(0x00007faff77f8000,0x00007faff78f9000)] + 0x00007fb0142c5000 JavaThread "pool-1-thread-15" [_thread_blocked, id=10043, stack(0x00007faff78f9000,0x00007faff79fa000)] + 0x00007fb0142c3000 JavaThread "pool-1-thread-14" [_thread_blocked, id=10042, stack(0x00007faff79fa000,0x00007faff7afb000)] + 0x00007fb0142c1800 JavaThread "pool-1-thread-13" [_thread_blocked, id=10041, stack(0x00007faff7afb000,0x00007faff7bfc000)] + 0x00007fb0142bf800 JavaThread "pool-1-thread-12" [_thread_blocked, id=10040, stack(0x00007faff7bfc000,0x00007faff7cfd000)] + 0x00007fb0142be000 JavaThread "pool-1-thread-11" [_thread_blocked, id=10039, stack(0x00007faff7cfd000,0x00007faff7dfe000)] + 0x00007fb0142ba800 JavaThread "pool-1-thread-10" [_thread_blocked, id=10038, stack(0x00007faff7dfe000,0x00007faff7eff000)] + 0x00007fb0142b6800 JavaThread "pool-1-thread-9" [_thread_blocked, id=10037, stack(0x00007faff7eff000,0x00007faff8000000)] + 0x00007fb0142b8800 JavaThread "pool-1-thread-8" [_thread_blocked, id=10036, stack(0x00007faffc08c000,0x00007faffc18d000)] + 0x00007fb01428d000 JavaThread "pool-1-thread-7" [_thread_blocked, id=10035, stack(0x00007faffc18d000,0x00007faffc28e000)] + 0x00007fb0142b5000 JavaThread "pool-1-thread-6" [_thread_blocked, id=10034, stack(0x00007faffc28e000,0x00007faffc38f000)] + 0x00007fb0142b3000 JavaThread "pool-1-thread-5" [_thread_blocked, id=10033, stack(0x00007faffc38f000,0x00007faffc490000)] + 0x00007fb0142b1000 JavaThread "pool-1-thread-4" [_thread_blocked, id=10032, stack(0x00007faffc490000,0x00007faffc591000)] + 0x00007fb0142af800 JavaThread "pool-1-thread-3" [_thread_blocked, id=10031, stack(0x00007faffc591000,0x00007faffc692000)] + 0x00007fb0142ad800 JavaThread "pool-1-thread-2" [_thread_blocked, id=10030, stack(0x00007faffc692000,0x00007faffc793000)] + 0x00007fb0142ac800 JavaThread "pool-1-thread-1" [_thread_blocked, id=10029, stack(0x00007faffc793000,0x00007faffc894000)] + 0x00007fb014193800 JavaThread "Service Thread" daemon [_thread_blocked, id=10027, stack(0x00007faffdabe000,0x00007faffdbbf000)] + 0x00007fb014188800 JavaThread "C1 CompilerThread2" daemon [_thread_blocked, id=10026, stack(0x00007faffdbbf000,0x00007faffdcc0000)] + 0x00007fb014186800 JavaThread "C2 CompilerThread1" daemon [_thread_in_native, id=10025, stack(0x00007faffdcc0000,0x00007faffddc1000)] + 0x00007fb014183800 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=10024, stack(0x00007faffddc1000,0x00007faffdec2000)] + 0x00007fb014182000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=10023, stack(0x00007faffdec2000,0x00007faffdfc3000)] + 0x00007fb01414f000 JavaThread "Finalizer" daemon [_thread_blocked, id=10022, stack(0x00007faffe29b000,0x00007faffe39c000)] + 0x00007fb01414a800 JavaThread "Reference Handler" daemon [_thread_blocked, id=10021, stack(0x00007faffe39c000,0x00007faffe49d000)] + 0x00007fb01400d800 JavaThread "main" [_thread_blocked, id=10015, stack(0x00007fb01b97c000,0x00007fb01ba7d000)] + +Other Threads: +=>0x00007fb014142800 VMThread [stack: 0x00007faffe49d000,0x00007faffe59e000] [id=10020] + 0x00007fb014198800 WatcherThread [stack: 0x00007faffd9bd000,0x00007faffdabe000] [id=10028] + +VM state:at safepoint (normal execution) + +VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event]) +[0x00007fb014009f60] Threads_lock - owner thread: 0x00007fb014142800 +[0x00007fb01400a460] Heap_lock - owner thread: 0x00007fb0142b3000 + +Heap: + PSYoungGen total 253440K, used 9705K [0x0000000771b80000, 0x0000000781c80000, 0x00000007c0000000) + eden space 243712K, 0% used [0x0000000771b80000,0x0000000771b80000,0x0000000780980000) + from space 9728K, 99% used [0x0000000780980000,0x00000007812fa6d0,0x0000000781300000) + to space 9728K, 0% used [0x0000000781300000,0x0000000781300000,0x0000000781c80000) + ParOldGen total 161280K, used 129195K [0x00000006d5200000, 0x00000006def80000, 0x0000000771b80000) + object space 161280K, 80% used [0x00000006d5200000,0x00000006dd02acd8,0x00000006def80000) + Metaspace used 13170K, capacity 13940K, committed 13952K, reserved 1060864K + class space used 1731K, capacity 1916K, committed 1920K, reserved 1048576K + +Card table byte_map: [0x00007fb0048a8000,0x00007fb005000000] byte_map_base: 0x00007fb0011ff000 + +Marking Bits: (ParMarkBitMap*) 0x00007fb01ae4d920 + Begin Bits: [0x00007fafe0a90000, 0x00007fafe4548000) + End Bits: [0x00007fafe4548000, 0x00007fafe8000000) + +Polling page: 0x00007fb01baa0000 + +CodeCache: size=245760Kb used=4437Kb max_used=4449Kb free=241322Kb + bounds [0x00007fb005000000, 0x00007fb005460000, 0x00007fb014000000] + total_blobs=1922 nmethods=1572 adapters=263 + compilation: enabled + +Compilation events (10 events): +Event: 2.695 Thread 0x00007fb014188800 nmethod 1908 0x00007fb005454dd0 code [0x00007fb005454f80, 0x00007fb005455578] +Event: 2.695 Thread 0x00007fb014188800 1910 3 java.util.regex.Pattern::atom (379 bytes) +Event: 2.712 Thread 0x00007fb014188800 nmethod 1910 0x00007fb005455790 code [0x00007fb005455aa0, 0x00007fb005457058] +Event: 2.712 Thread 0x00007fb014188800 1982 3 org.openjdk.tools.javac.parser.JavacParser::term3 (2515 bytes) +Event: 2.758 Thread 0x00007fb014183800 nmethod 1968 0x00007fb00545abd0 code [0x00007fb00545ad80, 0x00007fb00545b258] +Event: 2.758 Thread 0x00007fb014183800 1967 4 java.util.regex.Pattern$Curly::match (86 bytes) +Event: 2.773 Thread 0x00007fb014183800 nmethod 1967 0x00007fb005458c10 code [0x00007fb005458d80, 0x00007fb005459238] +Event: 2.773 Thread 0x00007fb014183800 1983 4 java.util.Objects::requireNonNull (14 bytes) +Event: 2.774 Thread 0x00007fb014183800 nmethod 1983 0x00007fb005437190 code [0x00007fb0054372e0, 0x00007fb005437338] +Event: 2.774 Thread 0x00007fb014183800 1342 4 com.google.common.collect.Iterators::getLast (21 bytes) + +GC Heap History (9 events): +Event: 0.568 GC heap before +{Heap before GC invocations=1 (full 0): + PSYoungGen total 70656K, used 60928K [0x0000000771b80000, 0x0000000776a00000, 0x00000007c0000000) + eden space 60928K, 100% used [0x0000000771b80000,0x0000000775700000,0x0000000775700000) + from space 9728K, 0% used [0x0000000776080000,0x0000000776080000,0x0000000776a00000) + to space 9728K, 0% used [0x0000000775700000,0x0000000775700000,0x0000000776080000) + ParOldGen total 161280K, used 0K [0x00000006d5200000, 0x00000006def80000, 0x0000000771b80000) + object space 161280K, 0% used [0x00000006d5200000,0x00000006d5200000,0x00000006def80000) + Metaspace used 7908K, capacity 8104K, committed 8320K, reserved 1056768K + class space used 1005K, capacity 1068K, committed 1152K, reserved 1048576K +Event: 0.583 GC heap after +Heap after GC invocations=1 (full 0): + PSYoungGen total 70656K, used 9726K [0x0000000771b80000, 0x000000077a580000, 0x00000007c0000000) + eden space 60928K, 0% used [0x0000000771b80000,0x0000000771b80000,0x0000000775700000) + from space 9728K, 99% used [0x0000000775700000,0x000000077607f938,0x0000000776080000) + to space 9728K, 0% used [0x0000000779c00000,0x0000000779c00000,0x000000077a580000) + ParOldGen total 161280K, used 10578K [0x00000006d5200000, 0x00000006def80000, 0x0000000771b80000) + object space 161280K, 6% used [0x00000006d5200000,0x00000006d5c54aa8,0x00000006def80000) + Metaspace used 7908K, capacity 8104K, committed 8320K, reserved 1056768K + class space used 1005K, capacity 1068K, committed 1152K, reserved 1048576K +} +Event: 0.823 GC heap before +{Heap before GC invocations=2 (full 0): + PSYoungGen total 70656K, used 70654K [0x0000000771b80000, 0x000000077a580000, 0x00000007c0000000) + eden space 60928K, 100% used [0x0000000771b80000,0x0000000775700000,0x0000000775700000) + from space 9728K, 99% used [0x0000000775700000,0x000000077607f938,0x0000000776080000) + to space 9728K, 0% used [0x0000000779c00000,0x0000000779c00000,0x000000077a580000) + ParOldGen total 161280K, used 10580K [0x00000006d5200000, 0x00000006def80000, 0x0000000771b80000) + object space 161280K, 6% used [0x00000006d5200000,0x00000006d5c55328,0x00000006def80000) + Metaspace used 8812K, capacity 9094K, committed 9216K, reserved 1056768K + class space used 1166K, capacity 1239K, committed 1280K, reserved 1048576K +Event: 0.866 GC heap after +Heap after GC invocations=2 (full 0): + PSYoungGen total 131584K, used 9720K [0x0000000771b80000, 0x000000077a580000, 0x00000007c0000000) + eden space 121856K, 0% used [0x0000000771b80000,0x0000000771b80000,0x0000000779280000) + from space 9728K, 99% used [0x0000000779c00000,0x000000077a57e218,0x000000077a580000) + to space 9728K, 0% used [0x0000000779280000,0x0000000779280000,0x0000000779c00000) + ParOldGen total 161280K, used 28946K [0x00000006d5200000, 0x00000006def80000, 0x0000000771b80000) + object space 161280K, 17% used [0x00000006d5200000,0x00000006d6e44a70,0x00000006def80000) + Metaspace used 8812K, capacity 9094K, committed 9216K, reserved 1056768K + class space used 1166K, capacity 1239K, committed 1280K, reserved 1048576K +} +Event: 1.619 GC heap before +{Heap before GC invocations=3 (full 0): + PSYoungGen total 131584K, used 131576K [0x0000000771b80000, 0x000000077a580000, 0x00000007c0000000) + eden space 121856K, 100% used [0x0000000771b80000,0x0000000779280000,0x0000000779280000) + from space 9728K, 99% used [0x0000000779c00000,0x000000077a57e218,0x000000077a580000) + to space 9728K, 0% used [0x0000000779280000,0x0000000779280000,0x0000000779c00000) + ParOldGen total 161280K, used 28953K [0x00000006d5200000, 0x00000006def80000, 0x0000000771b80000) + object space 161280K, 17% used [0x00000006d5200000,0x00000006d6e46740,0x00000006def80000) + Metaspace used 13042K, capacity 13772K, committed 13952K, reserved 1060864K + class space used 1729K, capacity 1884K, committed 1920K, reserved 1048576K +Event: 1.675 GC heap after +Heap after GC invocations=3 (full 0): + PSYoungGen total 131584K, used 9706K [0x0000000771b80000, 0x0000000781c80000, 0x00000007c0000000) + eden space 121856K, 0% used [0x0000000771b80000,0x0000000771b80000,0x0000000779280000) + from space 9728K, 99% used [0x0000000779280000,0x0000000779bfab68,0x0000000779c00000) + to space 9728K, 0% used [0x0000000781300000,0x0000000781300000,0x0000000781c80000) + ParOldGen total 161280K, used 54627K [0x00000006d5200000, 0x00000006def80000, 0x0000000771b80000) + object space 161280K, 33% used [0x00000006d5200000,0x00000006d8758f00,0x00000006def80000) + Metaspace used 13042K, capacity 13772K, committed 13952K, reserved 1060864K + class space used 1729K, capacity 1884K, committed 1920K, reserved 1048576K +} +Event: 2.077 GC heap before +{Heap before GC invocations=4 (full 0): + PSYoungGen total 131584K, used 131500K [0x0000000771b80000, 0x0000000781c80000, 0x00000007c0000000) + eden space 121856K, 99% used [0x0000000771b80000,0x0000000779270558,0x0000000779280000) + from space 9728K, 99% used [0x0000000779280000,0x0000000779bfab68,0x0000000779c00000) + to space 9728K, 0% used [0x0000000781300000,0x0000000781300000,0x0000000781c80000) + ParOldGen total 161280K, used 54627K [0x00000006d5200000, 0x00000006def80000, 0x0000000771b80000) + object space 161280K, 33% used [0x00000006d5200000,0x00000006d8758f00,0x00000006def80000) + Metaspace used 13085K, capacity 13836K, committed 13952K, reserved 1060864K + class space used 1729K, capacity 1884K, committed 1920K, reserved 1048576K +Event: 2.126 GC heap after +Heap after GC invocations=4 (full 0): + PSYoungGen total 253440K, used 9707K [0x0000000771b80000, 0x0000000781c80000, 0x00000007c0000000) + eden space 243712K, 0% used [0x0000000771b80000,0x0000000771b80000,0x0000000780980000) + from space 9728K, 99% used [0x0000000781300000,0x0000000781c7aee8,0x0000000781c80000) + to space 9728K, 0% used [0x0000000780980000,0x0000000780980000,0x0000000781300000) + ParOldGen total 161280K, used 82698K [0x00000006d5200000, 0x00000006def80000, 0x0000000771b80000) + object space 161280K, 51% used [0x00000006d5200000,0x00000006da2c2890,0x00000006def80000) + Metaspace used 13085K, capacity 13836K, committed 13952K, reserved 1060864K + class space used 1729K, capacity 1884K, committed 1920K, reserved 1048576K +} +Event: 2.825 GC heap before +{Heap before GC invocations=5 (full 0): + PSYoungGen total 253440K, used 253419K [0x0000000771b80000, 0x0000000781c80000, 0x00000007c0000000) + eden space 243712K, 100% used [0x0000000771b80000,0x0000000780980000,0x0000000780980000) + from space 9728K, 99% used [0x0000000781300000,0x0000000781c7aee8,0x0000000781c80000) + to space 9728K, 0% used [0x0000000780980000,0x0000000780980000,0x0000000781300000) + ParOldGen total 161280K, used 82698K [0x00000006d5200000, 0x00000006def80000, 0x0000000771b80000) + object space 161280K, 51% used [0x00000006d5200000,0x00000006da2c2890,0x00000006def80000) + Metaspace used 13170K, capacity 13940K, committed 13952K, reserved 1060864K + class space used 1731K, capacity 1916K, committed 1920K, reserved 1048576K + +Deoptimization events (10 events): +Event: 1.320 Thread 0x00007fb0142b3000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00007fb0052732c4 method=com.google.common.collect.Range.isConnected(Lcom/google/common/collect/Range;)Z @ 8 +Event: 1.320 Thread 0x00007fb0142b3000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00007fb005272b58 method=com.google.common.collect.Cut$BelowValue.(Ljava/lang/Comparable;)V @ 5 +Event: 1.320 Thread 0x00007fb0142b3000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00007fb0052b7428 method=com.google.common.collect.Range.compareOrThrow(Ljava/lang/Comparable;Ljava/lang/Comparable;)I @ 2 +Event: 1.322 Thread 0x00007fb0142c8800 Uncommon trap: reason=speculate_class_check action=maybe_recompile pc=0x00007fb0052a8e94 method=com.google.common.collect.AbstractIndexedListIterator.next()Ljava/lang/Object; @ 27 +Event: 1.322 Thread 0x00007fb0142c8800 Uncommon trap: reason=speculate_class_check action=maybe_recompile pc=0x00007fb00524ec98 method=com.google.common.collect.Range.(Lcom/google/common/collect/Cut;Lcom/google/common/collect/Cut;)V @ 28 +Event: 1.322 Thread 0x00007fb0142c8800 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00007fb0052732c4 method=com.google.common.collect.Range.isConnected(Lcom/google/common/collect/Range;)Z @ 8 +Event: 1.322 Thread 0x00007fb0142c8800 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00007fb005272b58 method=com.google.common.collect.Cut$BelowValue.(Ljava/lang/Comparable;)V @ 5 +Event: 1.323 Thread 0x00007fb0142c8800 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00007fb0052b7428 method=com.google.common.collect.Range.compareOrThrow(Ljava/lang/Comparable;Ljava/lang/Comparable;)I @ 2 +Event: 1.337 Thread 0x00007fb0142b5000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x00007fb005272e88 method=com.google.common.collect.Range.compareOrThrow(Ljava/lang/Comparable;Ljava/lang/Comparable;)I @ 2 +Event: 2.473 Thread 0x00007fb0142c5000 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00007fb0054285e8 method=java.lang.Integer.equals(Ljava/lang/Object;)Z @ 18 + +Classes redefined (0 events): +No events + +Internal exceptions (9 events): +Event: 0.024 Thread 0x00007fb01400d800 Exception (0x0000000771b87ca0) thrown at [/HUDSON/workspace/8-2-build-linux-amd64/jdk8u161/10277/hotspot/src/sh +Event: 0.024 Thread 0x00007fb01400d800 Exception (0x0000000771b87f88) thrown at [/HUDSON/workspace/8-2-build-linux-amd64/jdk8u161/10277/hotspot/src/share/vm/prims/jni.c +Event: 0.261 Thread 0x00007fb0142c3000 Exception (0x0000000773cb9e98) thrown at [/HUDSON/workspace/8-2-build-linux-amd64/jdk8u161/10277/hotspot/src/share/vm/prims/methodHandles.cpp, line 1167] +Event: 0.263 Thread 0x00007fb0142c3000 Exception (0x0000000773cc7608) thrown at [/HUDSON/workspace/8-2-build-linux-amd64/jdk8u161/10277/hotspot/src/share/vm/prims/methodHandles.cpp, line 1167] +Event: 0.319 Thread 0x00007fb0142ca000 Exception (0x0000000773640cb8) thrown at [/HUDSON/workspace/8-2-build-linux-amd64/jdk8u161/10277/hotspot/src/share/vm/prims/jvm.cpp, line 1390] +Event: 0.319 Thread 0x00007fb0142ca000 Exception (0x00000007736410b0) thrown at [/HUDSON/workspace/8-2-build-linux-amd64/jdk8u161/10277/hotspot/src/share/vm/prims/jvm.cpp, line 1390] +Event: 0.319 Thread 0x00007fb0142ca000 Exception (0x00000007736438e8) thrown at [/HUDSON/workspace/8-2-build-linux-amd64/jdk8u161/10277/hotspot/src/share/vm/prims/jvm.cpp, line 1390] +Event: 0.319 Thread 0x00007fb0142ca000 Exception (0x0000000773643ce0) thrown at [/HUDSON/workspace/8-2-build-linux-amd64/jdk8u161/10277/hotspot/src/share/vm/prims/jvm.cpp, line 1390] +Event: 1.283 Thread 0x00007fb0142b8800 Exception (0x0000000773ea7aa8) thrown at [/HUDSON/workspace/8-2-build-linux-amd64/jdk8u161/10277/hotspot/sr + +Events (10 events): +Event: 2.473 Thread 0x00007fb0142c5000 DEOPT UNPACKING pc=0x00007fb00504573a sp=0x00007faff79f7738 mode 2 +Event: 2.579 Thread 0x00007fb0142b3000 DEOPT PACKING pc=0x00007fb00521a567 sp=0x00007faffc48dba0 +Event: 2.579 Thread 0x00007fb0142b3000 DEOPT UNPACKING pc=0x00007fb005047784 sp=0x00007faffc48d8c0 mode 0 +Event: 2.644 Thread 0x00007fb0142b5000 DEOPT PACKING pc=0x00007fb005405e2a sp=0x00007faffc38b890 +Event: 2.644 Thread 0x00007fb0142b5000 DEOPT UNPACKING pc=0x00007fb005047784 sp=0x00007faffc38b660 mode 0 +Event: 2.649 Thread 0x00007fb0142be000 DEOPT PACKING pc=0x00007fb00521a567 sp=0x00007faff7dfbea0 +Event: 2.649 Thread 0x00007fb0142be000 DEOPT UNPACKING pc=0x00007fb005047784 sp=0x00007faff7dfbbc0 mode 0 +Event: 2.649 Thread 0x00007fb0142be000 DEOPT PACKING pc=0x00007fb0052fed47 sp=0x00007faff7dfc1a0 +Event: 2.649 Thread 0x00007fb0142be000 DEOPT UNPACKING pc=0x00007fb005047784 sp=0x00007faff7dfbee8 mode 0 +Event: 2.822 Executing VM operation: ParallelGCFailedAllocation + + +Dynamic libraries: +00400000-00401000 r-xp 00000000 08:01 162704 /usr/lib/jvm/java-8-oracle/jre/bin/java +00600000-00601000 rw-p 00000000 08:01 162704 /usr/lib/jvm/java-8-oracle/jre/bin/java +0090a000-00977000 rw-p 00000000 00:00 0 [heap] +6d5200000-6def80000 rw-p 00000000 00:00 0 +6def80000-771b80000 ---p 00000000 00:00 0 +771b80000-781c80000 rw-p 00000000 00:00 0 +796b80000-7c0000000 ---p 00000000 00:00 0 +7c0000000-7c01e0000 rw-p 00000000 00:00 0 +7c01e0000-800000000 ---p 00000000 00:00 0 +7faf74000000-7faf74086000 rw-p 00000000 00:00 0 +7faf74086000-7faf78000000 ---p 00000000 00:00 0 +7faf7c000000-7faf7c02b000 rw-p 00000000 00:00 0 +7faf7c02b000-7faf80000000 ---p 00000000 00:00 0 +7faf80000000-7faf8008c000 rw-p 00000000 00:00 0 +7faf8008c000-7faf84000000 ---p 00000000 00:00 0 +7faf84000000-7faf84021000 rw-p 00000000 00:00 0 +7faf84021000-7faf88000000 ---p 00000000 00:00 0 +7faf88000000-7faf88095000 rw-p 00000000 00:00 0 +7faf88095000-7faf8c000000 ---p 00000000 00:00 0 +7faf8c000000-7faf8c026000 rw-p 00000000 00:00 0 +7faf8c026000-7faf90000000 ---p 00000000 00:00 0 +7faf90000000-7faf90021000 rw-p 00000000 00:00 0 +7faf90021000-7faf94000000 ---p 00000000 00:00 0 +7faf94000000-7faf9402d000 rw-p 00000000 00:00 0 +7faf9402d000-7faf98000000 ---p 00000000 00:00 0 +7faf98000000-7faf98044000 rw-p 00000000 00:00 0 +7faf98044000-7faf9c000000 ---p 00000000 00:00 0 +7faf9c000000-7faf9c057000 rw-p 00000000 00:00 0 +7faf9c057000-7fafa0000000 ---p 00000000 00:00 0 +7fafa0000000-7fafa00cd000 rw-p 00000000 00:00 0 +7fafa00cd000-7fafa4000000 ---p 00000000 00:00 0 +7fafa4000000-7fafa40c5000 rw-p 00000000 00:00 0 +7fafa40c5000-7fafa8000000 ---p 00000000 00:00 0 +7fafa8000000-7fafa804c000 rw-p 00000000 00:00 0 +7fafa804c000-7fafac000000 ---p 00000000 00:00 0 +7fafac000000-7fafac036000 rw-p 00000000 00:00 0 +7fafac036000-7fafb0000000 ---p 00000000 00:00 0 +7fafb0000000-7fafb002d000 rw-p 00000000 00:00 0 +7fafb002d000-7fafb4000000 ---p 00000000 00:00 0 +7fafb4000000-7fafb4060000 rw-p 00000000 00:00 0 +7fafb4060000-7fafb8000000 ---p 00000000 00:00 0 +7fafb8000000-7fafb8021000 rw-p 00000000 00:00 0 +7fafb8021000-7fafbc000000 ---p 00000000 00:00 0 +7fafbc000000-7fafbc021000 rw-p 00000000 00:00 0 +7fafbc021000-7fafc0000000 ---p 00000000 00:00 0 +7fafc0000000-7fafc0021000 rw-p 00000000 00:00 0 +7fafc0021000-7fafc4000000 ---p 00000000 00:00 0 +7fafc4000000-7fafc483d000 rw-p 00000000 00:00 0 +7fafc483d000-7fafc8000000 ---p 00000000 00:00 0 +7fafc8000000-7fafc8453000 rw-p 00000000 00:00 0 +7fafc8453000-7fafcc000000 ---p 00000000 00:00 0 +7fafcc000000-7fafcc021000 rw-p 00000000 00:00 0 +7fafcc021000-7fafd0000000 ---p 00000000 00:00 0 +7fafd0000000-7fafd06d0000 rw-p 00000000 00:00 0 +7fafd06d0000-7fafd4000000 ---p 00000000 00:00 0 +7fafd4000000-7fafd4021000 rw-p 00000000 00:00 0 +7fafd4021000-7fafd8000000 ---p 00000000 00:00 0 +7fafd8000000-7fafd8021000 rw-p 00000000 00:00 0 +7fafd8021000-7fafdc000000 ---p 00000000 00:00 0 +7fafdc000000-7fafdc291000 rw-p 00000000 00:00 0 +7fafdc291000-7fafe0000000 ---p 00000000 00:00 0 +7fafe0a90000-7fafe8000000 rw-p 00000000 00:00 0 +7fafe8000000-7fafe8021000 rw-p 00000000 00:00 0 +7fafe8021000-7fafec000000 ---p 00000000 00:00 0 +7faff0000000-7faff0021000 rw-p 00000000 00:00 0 +7faff0021000-7faff4000000 ---p 00000000 00:00 0 +7faff6ff4000-7faff71b4000 rw-p 00000000 00:00 0 +7faff71b4000-7faff71f4000 ---p 00000000 00:00 0 +7faff71f4000-7faff73f4000 rw-p 00000000 00:00 0 +7faff73f4000-7faff73f7000 ---p 00000000 00:00 0 +7faff73f7000-7faff74f5000 rw-p 00000000 00:00 0 +7faff74f5000-7faff74f8000 ---p 00000000 00:00 0 +7faff74f8000-7faff75f6000 rw-p 00000000 00:00 0 +7faff75f6000-7faff75f9000 ---p 00000000 00:00 0 +7faff75f9000-7faff76f7000 rw-p 00000000 00:00 0 +7faff76f7000-7faff76fa000 ---p 00000000 00:00 0 +7faff76fa000-7faff77f8000 rw-p 00000000 00:00 0 +7faff77f8000-7faff77fb000 ---p 00000000 00:00 0 +7faff77fb000-7faff78f9000 rw-p 00000000 00:00 0 +7faff78f9000-7faff78fc000 ---p 00000000 00:00 0 +7faff78fc000-7faff79fa000 rw-p 00000000 00:00 0 +7faff79fa000-7faff79fd000 ---p 00000000 00:00 0 +7faff79fd000-7faff7afb000 rw-p 00000000 00:00 0 +7faff7afb000-7faff7afe000 ---p 00000000 00:00 0 +7faff7afe000-7faff7bfc000 rw-p 00000000 00:00 0 +7faff7bfc000-7faff7bff000 ---p 00000000 00:00 0 +7faff7bff000-7faff7cfd000 rw-p 00000000 00:00 0 +7faff7cfd000-7faff7d00000 ---p 00000000 00:00 0 +7faff7d00000-7faff7dfe000 rw-p 00000000 00:00 0 +7faff7dfe000-7faff7e01000 ---p 00000000 00:00 0 +7faff7e01000-7faff7eff000 rw-p 00000000 00:00 0 +7faff7eff000-7faff7f02000 ---p 00000000 00:00 0 +7faff7f02000-7faff8000000 rw-p 00000000 00:00 0 +7faff8000000-7faff8021000 rw-p 00000000 00:00 0 +7faff8021000-7faffc000000 ---p 00000000 00:00 0 +7faffc08c000-7faffc08f000 ---p 00000000 00:00 0 +7faffc08f000-7faffc18d000 rw-p 00000000 00:00 0 +7faffc18d000-7faffc190000 ---p 00000000 00:00 0 +7faffc190000-7faffc28e000 rw-p 00000000 00:00 0 +7faffc28e000-7faffc291000 ---p 00000000 00:00 0 +7faffc291000-7faffc38f000 rw-p 00000000 00:00 0 +7faffc38f000-7faffc392000 ---p 00000000 00:00 0 +7faffc392000-7faffc490000 rw-p 00000000 00:00 0 +7faffc490000-7faffc493000 ---p 00000000 00:00 0 +7faffc493000-7faffc591000 rw-p 00000000 00:00 0 +7faffc591000-7faffc594000 ---p 00000000 00:00 0 +7faffc594000-7faffc692000 rw-p 00000000 00:00 0 +7faffc692000-7faffc695000 ---p 00000000 00:00 0 +7faffc695000-7faffc793000 rw-p 00000000 00:00 0 +7faffc793000-7faffc796000 ---p 00000000 00:00 0 +7faffc796000-7faffd495000 rw-p 00000000 00:00 0 +7faffd495000-7faffd4ab000 r-xp 00000000 08:01 160233 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libnet.so +7faffd4ab000-7faffd6ab000 ---p 00016000 08:01 160233 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libnet.so +7faffd6ab000-7faffd6ac000 rw-p 00016000 08:01 160233 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libnet.so +7faffd6ac000-7faffd6bd000 r-xp 00000000 08:01 160194 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libnio.so +7faffd6bd000-7faffd8bc000 ---p 00011000 08:01 160194 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libnio.so +7faffd8bc000-7faffd8bd000 rw-p 00010000 08:01 160194 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libnio.so +7faffd8bd000-7faffd927000 r--s 00566000 08:01 1325483 /home/kbuilder/.cache/synthtool/google-java-format-1.7.jar +7faffd927000-7faffd9bd000 r--s 0110a000 08:01 150646 /usr/lib/jvm/java-8-oracle/jre/lib/ext/jfxrt.jar +7faffd9bd000-7faffd9be000 ---p 00000000 00:00 0 +7faffd9be000-7faffdabe000 rw-p 00000000 00:00 0 +7faffdabe000-7faffdac1000 ---p 00000000 00:00 0 +7faffdac1000-7faffdbbf000 rw-p 00000000 00:00 0 +7faffdbbf000-7faffdbc2000 ---p 00000000 00:00 0 +7faffdbc2000-7faffdcc0000 rw-p 00000000 00:00 0 +7faffdcc0000-7faffdcc3000 ---p 00000000 00:00 0 +7faffdcc3000-7faffddc1000 rw-p 00000000 00:00 0 +7faffddc1000-7faffddc4000 ---p 00000000 00:00 0 +7faffddc4000-7faffdec2000 rw-p 00000000 00:00 0 +7faffdec2000-7faffdec5000 ---p 00000000 00:00 0 +7faffdec5000-7faffdfc3000 rw-p 00000000 00:00 0 +7faffdfc3000-7faffe29b000 r--p 00000000 08:01 899 /usr/lib/locale/locale-archive +7faffe29b000-7faffe29e000 ---p 00000000 00:00 0 +7faffe29e000-7faffe39c000 rw-p 00000000 00:00 0 +7faffe39c000-7faffe39f000 ---p 00000000 00:00 0 +7faffe39f000-7faffe49d000 rw-p 00000000 00:00 0 +7faffe49d000-7faffe49e000 ---p 00000000 00:00 0 +7faffe49e000-7fb000000000 rw-p 00000000 00:00 0 +7fb000000000-7fb000021000 rw-p 00000000 00:00 0 +7fb000021000-7fb004000000 ---p 00000000 00:00 0 +7fb004004000-7fb004457000 rw-p 00000000 00:00 0 +7fb004457000-7fb004630000 r--s 03d64000 08:01 150641 /usr/lib/jvm/java-8-oracle/jre/lib/rt.jar +7fb004630000-7fb0046a6000 rw-p 00000000 00:00 0 +7fb0046a6000-7fb0046a7000 ---p 00000000 00:00 0 +7fb0046a7000-7fb0047a7000 rw-p 00000000 00:00 0 +7fb0047a7000-7fb0047a8000 ---p 00000000 00:00 0 +7fb0047a8000-7fb0048f7000 rw-p 00000000 00:00 0 +7fb0048f7000-7fb004d8c000 ---p 00000000 00:00 0 +7fb004d8c000-7fb004e0e000 rw-p 00000000 00:00 0 +7fb004e0e000-7fb004fff000 ---p 00000000 00:00 0 +7fb004fff000-7fb005000000 rw-p 00000000 00:00 0 +7fb005000000-7fb005460000 rwxp 00000000 00:00 0 +7fb005460000-7fb014000000 ---p 00000000 00:00 0 +7fb014000000-7fb0144e7000 rw-p 00000000 00:00 0 +7fb0144e7000-7fb018000000 ---p 00000000 00:00 0 +7fb01802f000-7fb018030000 ---p 00000000 00:00 0 +7fb018030000-7fb018130000 rw-p 00000000 00:00 0 +7fb018130000-7fb018131000 ---p 00000000 00:00 0 +7fb018131000-7fb018280000 rw-p 00000000 00:00 0 +7fb018280000-7fb018716000 ---p 00000000 00:00 0 +7fb018716000-7fb018728000 rw-p 00000000 00:00 0 +7fb018728000-7fb018ad6000 ---p 00000000 00:00 0 +7fb018ad6000-7fb018af1000 r-xp 00000000 08:01 160221 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libzip.so +7fb018af1000-7fb018cf1000 ---p 0001b000 08:01 160221 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libzip.so +7fb018cf1000-7fb018cf2000 rw-p 0001b000 08:01 160221 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libzip.so +7fb018cf2000-7fb018cfd000 r-xp 00000000 08:01 1048912 /lib/x86_64-linux-gnu/libnss_files-2.23.so +7fb018cfd000-7fb018efc000 ---p 0000b000 08:01 1048912 /lib/x86_64-linux-gnu/libnss_files-2.23.so +7fb018efc000-7fb018efd000 r--p 0000a000 08:01 1048912 /lib/x86_64-linux-gnu/libnss_files-2.23.so +7fb018efd000-7fb018efe000 rw-p 0000b000 08:01 1048912 /lib/x86_64-linux-gnu/libnss_files-2.23.so +7fb018efe000-7fb018f04000 rw-p 00000000 00:00 0 +7fb018f04000-7fb018f0f000 r-xp 00000000 08:01 1048859 /lib/x86_64-linux-gnu/libnss_nis-2.23.so +7fb018f0f000-7fb01910e000 ---p 0000b000 08:01 1048859 /lib/x86_64-linux-gnu/libnss_nis-2.23.so +7fb01910e000-7fb01910f000 r--p 0000a000 08:01 1048859 /lib/x86_64-linux-gnu/libnss_nis-2.23.so +7fb01910f000-7fb019110000 rw-p 0000b000 08:01 1048859 /lib/x86_64-linux-gnu/libnss_nis-2.23.so +7fb019110000-7fb019126000 r-xp 00000000 08:01 1048893 /lib/x86_64-linux-gnu/libnsl-2.23.so +7fb019126000-7fb019325000 ---p 00016000 08:01 1048893 /lib/x86_64-linux-gnu/libnsl-2.23.so +7fb019325000-7fb019326000 r--p 00015000 08:01 1048893 /lib/x86_64-linux-gnu/libnsl-2.23.so +7fb019326000-7fb019327000 rw-p 00016000 08:01 1048893 /lib/x86_64-linux-gnu/libnsl-2.23.so +7fb019327000-7fb019329000 rw-p 00000000 00:00 0 +7fb019329000-7fb019331000 r-xp 00000000 08:01 1048939 /lib/x86_64-linux-gnu/libnss_compat-2.23.so +7fb019331000-7fb019530000 ---p 00008000 08:01 1048939 /lib/x86_64-linux-gnu/libnss_compat-2.23.so +7fb019530000-7fb019531000 r--p 00007000 08:01 1048939 /lib/x86_64-linux-gnu/libnss_compat-2.23.so +7fb019531000-7fb019532000 rw-p 00008000 08:01 1048939 /lib/x86_64-linux-gnu/libnss_compat-2.23.so +7fb019532000-7fb01955d000 r-xp 00000000 08:01 160227 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libjava.so +7fb01955d000-7fb01975c000 ---p 0002b000 08:01 160227 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libjava.so +7fb01975c000-7fb01975e000 rw-p 0002a000 08:01 160227 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libjava.so +7fb01975e000-7fb01976b000 r-xp 00000000 08:01 160231 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libverify.so +7fb01976b000-7fb01996b000 ---p 0000d000 08:01 160231 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libverify.so +7fb01996b000-7fb01996d000 rw-p 0000d000 08:01 160231 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/libverify.so +7fb01996d000-7fb019974000 r-xp 00000000 08:01 1048833 /lib/x86_64-linux-gnu/librt-2.23.so +7fb019974000-7fb019b73000 ---p 00007000 08:01 1048833 /lib/x86_64-linux-gnu/librt-2.23.so +7fb019b73000-7fb019b74000 r--p 00006000 08:01 1048833 /lib/x86_64-linux-gnu/librt-2.23.so +7fb019b74000-7fb019b75000 rw-p 00007000 08:01 1048833 /lib/x86_64-linux-gnu/librt-2.23.so +7fb019b75000-7fb019c7d000 r-xp 00000000 08:01 1048942 /lib/x86_64-linux-gnu/libm-2.23.so +7fb019c7d000-7fb019e7c000 ---p 00108000 08:01 1048942 /lib/x86_64-linux-gnu/libm-2.23.so +7fb019e7c000-7fb019e7d000 r--p 00107000 08:01 1048942 /lib/x86_64-linux-gnu/libm-2.23.so +7fb019e7d000-7fb019e7e000 rw-p 00108000 08:01 1048942 /lib/x86_64-linux-gnu/libm-2.23.so +7fb019e7e000-7fb01ab57000 r-xp 00000000 08:01 160196 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/server/libjvm.so +7fb01ab57000-7fb01ad56000 ---p 00cd9000 08:01 160196 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/server/libjvm.so +7fb01ad56000-7fb01ae2f000 rw-p 00cd8000 08:01 160196 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/server/libjvm.so +7fb01ae2f000-7fb01ae7b000 rw-p 00000000 00:00 0 +7fb01ae7b000-7fb01b03b000 r-xp 00000000 08:01 1048938 /lib/x86_64-linux-gnu/libc-2.23.so +7fb01b03b000-7fb01b23b000 ---p 001c0000 08:01 1048938 /lib/x86_64-linux-gnu/libc-2.23.so +7fb01b23b000-7fb01b23f000 r--p 001c0000 08:01 1048938 /lib/x86_64-linux-gnu/libc-2.23.so +7fb01b23f000-7fb01b241000 rw-p 001c4000 08:01 1048938 /lib/x86_64-linux-gnu/libc-2.23.so +7fb01b241000-7fb01b245000 rw-p 00000000 00:00 0 +7fb01b245000-7fb01b248000 r-xp 00000000 08:01 1048843 /lib/x86_64-linux-gnu/libdl-2.23.so +7fb01b248000-7fb01b447000 ---p 00003000 08:01 1048843 /lib/x86_64-linux-gnu/libdl-2.23.so +7fb01b447000-7fb01b448000 r--p 00002000 08:01 1048843 /lib/x86_64-linux-gnu/libdl-2.23.so +7fb01b448000-7fb01b449000 rw-p 00003000 08:01 1048843 /lib/x86_64-linux-gnu/libdl-2.23.so +7fb01b449000-7fb01b45f000 r-xp 00000000 08:01 160239 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/jli/libjli.so +7fb01b45f000-7fb01b65e000 ---p 00016000 08:01 160239 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/jli/libjli.so +7fb01b65e000-7fb01b65f000 rw-p 00015000 08:01 160239 /usr/lib/jvm/java-8-oracle/jre/lib/amd64/jli/libjli.so +7fb01b65f000-7fb01b677000 r-xp 00000000 08:01 1048849 /lib/x86_64-linux-gnu/libpthread-2.23.so +7fb01b677000-7fb01b876000 ---p 00018000 08:01 1048849 /lib/x86_64-linux-gnu/libpthread-2.23.so +7fb01b876000-7fb01b877000 r--p 00017000 08:01 1048849 /lib/x86_64-linux-gnu/libpthread-2.23.so +7fb01b877000-7fb01b878000 rw-p 00018000 08:01 1048849 /lib/x86_64-linux-gnu/libpthread-2.23.so +7fb01b878000-7fb01b87c000 rw-p 00000000 00:00 0 +7fb01b87c000-7fb01b8a2000 r-xp 00000000 08:01 1048847 /lib/x86_64-linux-gnu/ld-2.23.so +7fb01b8d7000-7fb01b97c000 rw-p 00000000 00:00 0 +7fb01b97c000-7fb01b97f000 ---p 00000000 00:00 0 +7fb01b97f000-7fb01ba82000 rw-p 00000000 00:00 0 +7fb01ba97000-7fb01ba9f000 rw-s 00000000 08:01 543209 /tmp/hsperfdata_kbuilder/10014 +7fb01ba9f000-7fb01baa0000 rw-p 00000000 00:00 0 +7fb01baa0000-7fb01baa1000 ---p 00000000 00:00 0 +7fb01baa1000-7fb01baa2000 r--p 00025000 08:01 1048847 /lib/x86_64-linux-gnu/ld-2.23.so +7fb01baa2000-7fb01baa3000 rw-p 00026000 08:01 1048847 /lib/x86_64-linux-gnu/ld-2.23.so +7fb01baa3000-7fb01baa4000 rw-p 00000000 00:00 0 +7ffe0fab4000-7ffe0fad7000 rw-p 00000000 00:00 0 [stack] +7ffe0fb63000-7ffe0fb66000 r--p 00000000 00:00 0 [vvar] +7ffe0fb66000-7ffe0fb67000 r-xp 00000000 00:00 0 [vdso] +ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall] + +VM Arguments: +java_command: /home/kbuilder/.cache/synthtool/google-java-format-1.7.jar --replace proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java proto-google-cloud-datastore-v1/src/main/java/com/google/ +java_class_path (initial): /home/kbuilder/.cache/synthtool/google-java-format-1.7.jar +Launcher Type: SUN_STANDARD + +Environment Variables: +JAVA_HOME=/usr/lib/jvm/java-8-oracle +PATH=/tmpfs/src/github/synthtool/env/bin:/home/kbuilder/bazel:/opt/google-cloud-sdk/bin:/home/kbuilder/.pyenv/plugins/pyenv-virtualenv/shims:/home/kbuilder/.pyenv/shims:/home/kbuilder/.pyenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/lib/jvm/java-8-oracle/bin:/usr/lib/jvm/java-8-oracle/db/bin:/usr/lib/jvm/java-8-oracle/jre/bin:/usr/local/rvm/bin:/opt/android-sdk/current/bin:/usr/local/go/bin:/usr/local/go/packages/bin:/opt/android-sdk/current/bin:/usr/local/go/bin:/usr/local/go/packages/bin:/opt/kubernetes/client/bin:/opt/android-studio/bin:/usr/local/apache-maven/bin +LD_LIBRARY_PATH=/usr/local/tensorrt/lib +SHELL=/bin/bash + +Signal Handlers: +SIGSEGV: [libjvm.so+0xad01e0], sa_mask[0]=11111111011111111101111111111110, sa_flags=SA_RESTART|SA_SIGINFO +SIGBUS: [libjvm.so+0xad01e0], sa_mask[0]=11111111011111111101111111111110, sa_flags=SA_RESTART|SA_SIGINFO +SIGFPE: [libjvm.so+0x927fb0], sa_mask[0]=11111111011111111101111111111110, sa_flags=SA_RESTART|SA_SIGINFO +SIGPIPE: [libjvm.so+0x927fb0], sa_mask[0]=11111111011111111101111111111110, sa_flags=SA_RESTART|SA_SIGINFO +SIGXFSZ: [libjvm.so+0x927fb0], sa_mask[0]=11111111011111111101111111111110, sa_flags=SA_RESTART|SA_SIGINFO +SIGILL: [libjvm.so+0x927fb0], sa_mask[0]=11111111011111111101111111111110, sa_flags=SA_RESTART|SA_SIGINFO +SIGUSR1: SIG_DFL, sa_mask[0]=00000000000000000000000000000000, sa_flags=none +SIGUSR2: [libjvm.so+0x9297f0], sa_mask[0]=00000000000000000000000000000000, sa_flags=SA_RESTART|SA_SIGINFO +SIGHUP: SIG_IGN, sa_mask[0]=00000000000000000000000000000000, sa_flags=none +SIGINT: SIG_IGN, sa_mask[0]=00000000000000000000000000000000, sa_flags=none +SIGTERM: [libjvm.so+0x92abf0], sa_mask[0]=11111111011111111101111111111110, sa_flags=SA_RESTART|SA_SIGINFO +SIGQUIT: [libjvm.so+0x92abf0], sa_mask[0]=11111111011111111101111111111110, sa_flags=SA_RESTART|SA_SIGINFO + + +--------------- S Y S T E M --------------- + +OS:DISTRIB_ID=Ubuntu +DISTRIB_RELEASE=16.04 +DISTRIB_CODENAME=xenial +DISTRIB_DESCRIPTION="Ubuntu 16.04.6 LTS" + +uname:Linux 5.0.0-050000rc8-generic #201902242030 SMP Mon Feb 25 01:32:53 UTC 2019 x86_64 +libc:glibc 2.23 NPTL 2.23 +rlimit: STACK 8192k, CORE 0k, NPROC 59846, NOFILE 262144, AS infinity +load average:38.92 84.31 81.36 + +/proc/meminfo: +MemTotal: 15390888 kB +MemFree: 132648 kB +MemAvailable: 76556 kB +Buffers: 33220 kB +Cached: 132964 kB +SwapCached: 108808 kB +Active: 13677860 kB +Inactive: 1307648 kB +Active(anon): 13575816 kB +Inactive(anon): 1244636 kB +Active(file): 102044 kB +Inactive(file): 63012 kB +Unevictable: 0 kB +Mlocked: 0 kB +SwapTotal: 1048572 kB +SwapFree: 50060 kB +Dirty: 152 kB +Writeback: 0 kB +AnonPages: 14711440 kB +Mapped: 44404 kB +Shmem: 1000 kB +KReclaimable: 53448 kB +Slab: 114440 kB +SReclaimable: 53448 kB +SUnreclaim: 60992 kB +KernelStack: 14976 kB +PageTables: 46856 kB +NFS_Unstable: 0 kB +Bounce: 0 kB +WritebackTmp: 0 kB +CommitLimit: 8744016 kB +Committed_AS: 22324832 kB +VmallocTotal: 34359738367 kB +VmallocUsed: 0 kB +VmallocChunk: 0 kB +Percpu: 1712 kB +HardwareCorrupted: 0 kB +AnonHugePages: 0 kB +ShmemHugePages: 0 kB +ShmemPmdMapped: 0 kB +CmaTotal: 0 kB +CmaFree: 0 kB +HugePages_Total: 0 +HugePages_Free: 0 +HugePages_Rsvd: 0 +HugePages_Surp: 0 +Hugepagesize: 2048 kB +Hugetlb: 0 kB +DirectMap4k: 122868 kB +DirectMap2M: 4071424 kB +DirectMap1G: 13631488 kB + + +CPU:total 4 (initial active 4) (2 cores per cpu, 2 threads per core) family 6 model 79 stepping 0, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, erms, rtm, 3dnowpref, lzcnt, ht, tsc, tscinvbit, bmi1, bmi2, adx + +/proc/cpuinfo: +processor : 0 +vendor_id : GenuineIntel +cpu family : 6 +model : 79 +model name : Intel(R) Xeon(R) CPU @ 2.20GHz +stepping : 0 +microcode : 0x1 +cpu MHz : 2199.998 +cache size : 56320 KB +physical id : 0 +siblings : 4 +core id : 0 +cpu cores : 2 +apicid : 0 +initial apicid : 0 +fpu : yes +fpu_exception : yes +cpuid level : 13 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl xtopology nonstop_tsc cpuid tsc_known_freq pni pclmulqdq vmx ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm rdseed adx smap xsaveopt arat arch_capabilities +bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf +bogomips : 4399.99 +clflush size : 64 +cache_alignment : 64 +address sizes : 46 bits physical, 48 bits virtual +power management: + +processor : 1 +vendor_id : GenuineIntel +cpu family : 6 +model : 79 +model name : Intel(R) Xeon(R) CPU @ 2.20GHz +stepping : 0 +microcode : 0x1 +cpu MHz : 2199.998 +cache size : 56320 KB +physical id : 0 +siblings : 4 +core id : 1 +cpu cores : 2 +apicid : 2 +initial apicid : 2 +fpu : yes +fpu_exception : yes +cpuid level : 13 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl xtopology nonstop_tsc cpuid tsc_known_freq pni pclmulqdq vmx ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm rdseed adx smap xsaveopt arat arch_capabilities +bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf +bogomips : 4399.99 +clflush size : 64 +cache_alignment : 64 +address sizes : 46 bits physical, 48 bits virtual +power management: + +processor : 2 +vendor_id : GenuineIntel +cpu family : 6 +model : 79 +model name : Intel(R) Xeon(R) CPU @ 2.20GHz +stepping : 0 +microcode : 0x1 +cpu MHz : 2199.998 +cache size : 56320 KB +physical id : 0 +siblings : 4 +core id : 0 +cpu cores : 2 +apicid : 1 +initial apicid : 1 +fpu : yes +fpu_exception : yes +cpuid level : 13 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl xtopology nonstop_tsc cpuid tsc_known_freq pni pclmulqdq vmx ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm rdseed adx smap xsaveopt arat arch_capabilities +bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf +bogomips : 4399.99 +clflush size : 64 +cache_alignment : 64 +address sizes : 46 bits physical, 48 bits virtual +power management: + +processor : 3 +vendor_id : GenuineIntel +cpu family : 6 +model : 79 +model name : Intel(R) Xeon(R) CPU @ 2.20GHz +stepping : 0 +microcode : 0x1 +cpu MHz : 2199.998 +cache size : 56320 KB +physical id : 0 +siblings : 4 +core id : 1 +cpu cores : 2 +apicid : 3 +initial apicid : 3 +fpu : yes +fpu_exception : yes +cpuid level : 13 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ss ht syscall nx pdpe1gb rdtscp lm constant_tsc rep_good nopl xtopology nonstop_tsc cpuid tsc_known_freq pni pclmulqdq vmx ssse3 fma cx16 pcid sse4_1 sse4_2 x2apic movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm abm 3dnowprefetch invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm rdseed adx smap xsaveopt arat arch_capabilities +bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf +bogomips : 4399.99 +clflush size : 64 +cache_alignment : 64 +address sizes : 46 bits physical, 48 bits virtual +power management: + + + +Memory: 4k page, physical 15390888k(132648k free), swap 1048572k(49936k free) + +vm_info: Java HotSpot(TM) 64-Bit Server VM (25.161-b12) for linux-amd64 JRE (1.8.0_161-b12), built on Dec 19 2017 16:12:43 by "java_re" with gcc 4.3.0 20080428 (Red Hat 4.3.0-8) + +time: Wed May 6 10:16:39 2020 +elapsed time: 3 seconds (0d 0h 0m 3s) + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java index 1e5c2b4ff..ba402c659 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java @@ -19,24 +19,21 @@ package com.google.datastore.v1; /** - * - * * 
  * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
  *
* * Protobuf type {@code google.datastore.v1.AllocateIdsRequest} */ -public final class AllocateIdsRequest extends com.google.protobuf.GeneratedMessageV3 - implements +public final class AllocateIdsRequest extends + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:google.datastore.v1.AllocateIdsRequest) AllocateIdsRequestOrBuilder { - private static final long serialVersionUID = 0L; +private static final long serialVersionUID = 0L; // Use AllocateIdsRequest.newBuilder() to construct. private AllocateIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private AllocateIdsRequest() { projectId_ = ""; keys_ = java.util.Collections.emptyList(); @@ -44,15 +41,16 @@ private AllocateIdsRequest() { @java.lang.Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { return new AllocateIdsRequest(); } @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - private AllocateIdsRequest( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -72,35 +70,35 @@ private AllocateIdsRequest( case 0: done = true; break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - keys_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); - break; + case 10: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + keys_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - case 66: - { - java.lang.String s = input.readStringRequireUtf8(); + keys_.add( + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); + break; + } + case 66: { + java.lang.String s = input.readStringRequireUtf8(); - projectId_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; + projectId_ = s; + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { keys_ = java.util.Collections.unmodifiableList(keys_); @@ -109,33 +107,27 @@ private AllocateIdsRequest( makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.datastore.v1.DatastoreProto - .internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.google.datastore.v1.DatastoreProto - .internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.google.datastore.v1.AllocateIdsRequest.class, - com.google.datastore.v1.AllocateIdsRequest.Builder.class); + com.google.datastore.v1.AllocateIdsRequest.class, com.google.datastore.v1.AllocateIdsRequest.Builder.class); } public static final int PROJECT_ID_FIELD_NUMBER = 8; private volatile java.lang.Object projectId_; /** - * - * * 
    * Required. The ID of the project against which to make the request.
    *
* * string project_id = 8 [(.google.api.field_behavior) = REQUIRED]; - * * @return The projectId. */ public java.lang.String getProjectId() { @@ -143,28 +135,28 @@ public java.lang.String getProjectId() { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); projectId_ = s; return s; } } /** - * - * * 
    * Required. The ID of the project against which to make the request.
    *
* * string project_id = 8 [(.google.api.field_behavior) = REQUIRED]; - * * @return The bytes for projectId. */ - public com.google.protobuf.ByteString getProjectIdBytes() { + public com.google.protobuf.ByteString + getProjectIdBytes() { java.lang.Object ref = projectId_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); projectId_ = b; return b; } else { @@ -175,78 +167,64 @@ public com.google.protobuf.ByteString getProjectIdBytes() { public static final int KEYS_FIELD_NUMBER = 1; private java.util.List keys_; /** - * - * * 
    * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ public java.util.List getKeysList() { return keys_; } /** - * - * * 
    * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public java.util.List getKeysOrBuilderList() { + public java.util.List + getKeysOrBuilderList() { return keys_; } /** - * - * * 
    * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ public int getKeysCount() { return keys_.size(); } /** - * - * * 
    * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.datastore.v1.Key getKeys(int index) { return keys_.get(index); } /** - * - * * 
    * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) { + public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index) { return keys_.get(index); } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -258,7 +236,8 @@ public final boolean isInitialized() { } @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { for (int i = 0; i < keys_.size(); i++) { output.writeMessage(1, keys_.get(i)); } @@ -275,7 +254,8 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < keys_.size(); i++) { - size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i)); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, keys_.get(i)); } if (!getProjectIdBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); @@ -288,16 +268,17 @@ public int getSerializedSize() { @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { - return true; + return true; } if (!(obj instanceof com.google.datastore.v1.AllocateIdsRequest)) { return super.equals(obj); } - com.google.datastore.v1.AllocateIdsRequest other = - (com.google.datastore.v1.AllocateIdsRequest) obj; + com.google.datastore.v1.AllocateIdsRequest other = (com.google.datastore.v1.AllocateIdsRequest) obj; - if (!getProjectId().equals(other.getProjectId())) return false; - if (!getKeysList().equals(other.getKeysList())) return false; + if (!getProjectId() + .equals(other.getProjectId())) return false; + if (!getKeysList() + .equals(other.getKeysList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -320,127 +301,118 @@ public int hashCode() { return hash; } - public static com.google.datastore.v1.AllocateIdsRequest parseFrom(java.nio.ByteBuffer data) + public static com.google.datastore.v1.AllocateIdsRequest parseFrom( + java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.google.datastore.v1.AllocateIdsRequest parseFrom( - java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.google.datastore.v1.AllocateIdsRequest parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.google.datastore.v1.AllocateIdsRequest parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.google.datastore.v1.AllocateIdsRequest parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static com.google.datastore.v1.AllocateIdsRequest parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static com.google.datastore.v1.AllocateIdsRequest parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } - public static com.google.datastore.v1.AllocateIdsRequest parseFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } - - public static com.google.datastore.v1.AllocateIdsRequest parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + public static com.google.datastore.v1.AllocateIdsRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } - public static com.google.datastore.v1.AllocateIdsRequest parseDelimitedFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static com.google.datastore.v1.AllocateIdsRequest parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } - public static com.google.datastore.v1.AllocateIdsRequest parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } @java.lang.Override - public Builder newBuilderForType() { - return newBuilder(); - } - + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(com.google.datastore.v1.AllocateIdsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { - return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } @java.lang.Override - protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } /** - * - * * 
    * The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
    *
* * Protobuf type {@code google.datastore.v1.AllocateIdsRequest} */ - public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder - implements + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:google.datastore.v1.AllocateIdsRequest) com.google.datastore.v1.AllocateIdsRequestOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.datastore.v1.DatastoreProto - .internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.google.datastore.v1.DatastoreProto - .internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.google.datastore.v1.AllocateIdsRequest.class, - com.google.datastore.v1.AllocateIdsRequest.Builder.class); + com.google.datastore.v1.AllocateIdsRequest.class, com.google.datastore.v1.AllocateIdsRequest.Builder.class); } // Construct using com.google.datastore.v1.AllocateIdsRequest.newBuilder() @@ -448,17 +420,17 @@ private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { getKeysFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); @@ -474,9 +446,9 @@ public Builder clear() { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.google.datastore.v1.DatastoreProto - .internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor; } @java.lang.Override @@ -495,8 +467,7 @@ public com.google.datastore.v1.AllocateIdsRequest build() { @java.lang.Override public com.google.datastore.v1.AllocateIdsRequest buildPartial() { - com.google.datastore.v1.AllocateIdsRequest result = - new com.google.datastore.v1.AllocateIdsRequest(this); + com.google.datastore.v1.AllocateIdsRequest result = new com.google.datastore.v1.AllocateIdsRequest(this); int from_bitField0_ = bitField0_; result.projectId_ = projectId_; if (keysBuilder_ == null) { @@ -516,39 +487,38 @@ public com.google.datastore.v1.AllocateIdsRequest buildPartial() { public Builder clone() { return super.clone(); } - @java.lang.Override public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { return super.setField(field, value); } - @java.lang.Override - public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override - public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { return super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.datastore.v1.AllocateIdsRequest) { - return mergeFrom((com.google.datastore.v1.AllocateIdsRequest) other); + return mergeFrom((com.google.datastore.v1.AllocateIdsRequest)other); } else { super.mergeFrom(other); return this; @@ -579,10 +549,9 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) { keysBuilder_ = null; keys_ = other.keys_; bitField0_ = (bitField0_ & ~0x00000001); - keysBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders - ? getKeysFieldBuilder() - : null; + keysBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getKeysFieldBuilder() : null; } else { keysBuilder_.addAllMessages(other.keys_); } @@ -616,25 +585,22 @@ public Builder mergeFrom( } return this; } - private int bitField0_; private java.lang.Object projectId_ = ""; /** - * - * * 
      * Required. The ID of the project against which to make the request.
      *
* * string project_id = 8 [(.google.api.field_behavior) = REQUIRED]; - * * @return The projectId. */ public java.lang.String getProjectId() { java.lang.Object ref = projectId_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); projectId_ = s; return s; @@ -643,21 +609,20 @@ public java.lang.String getProjectId() { } } /** - * - * * 
      * Required. The ID of the project against which to make the request.
      *
* * string project_id = 8 [(.google.api.field_behavior) = REQUIRED]; - * * @return The bytes for projectId. */ - public com.google.protobuf.ByteString getProjectIdBytes() { + public com.google.protobuf.ByteString + getProjectIdBytes() { java.lang.Object ref = projectId_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); projectId_ = b; return b; } else { @@ -665,91 +630,78 @@ public com.google.protobuf.ByteString getProjectIdBytes() { } } /** - * - * * 
      * Required. The ID of the project against which to make the request.
      *
* * string project_id = 8 [(.google.api.field_behavior) = REQUIRED]; - * * @param value The projectId to set. * @return This builder for chaining. */ - public Builder setProjectId(java.lang.String value) { + public Builder setProjectId( + java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - + throw new NullPointerException(); + } + projectId_ = value; onChanged(); return this; } /** - * - * * 
      * Required. The ID of the project against which to make the request.
      *
* * string project_id = 8 [(.google.api.field_behavior) = REQUIRED]; - * * @return This builder for chaining. */ public Builder clearProjectId() { - + projectId_ = getDefaultInstance().getProjectId(); onChanged(); return this; } /** - * - * * 
      * Required. The ID of the project against which to make the request.
      *
* * string project_id = 8 [(.google.api.field_behavior) = REQUIRED]; - * * @param value The bytes for projectId to set. * @return This builder for chaining. */ - public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { + public Builder setProjectIdBytes( + com.google.protobuf.ByteString value) { if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + projectId_ = value; onChanged(); return this; } - private java.util.List keys_ = java.util.Collections.emptyList(); - + private java.util.List keys_ = + java.util.Collections.emptyList(); private void ensureKeysIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { keys_ = new java.util.ArrayList(keys_); bitField0_ |= 0x00000001; - } + } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.google.datastore.v1.Key, - com.google.datastore.v1.Key.Builder, - com.google.datastore.v1.KeyOrBuilder> - keysBuilder_; + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_; /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ public java.util.List getKeysList() { if (keysBuilder_ == null) { @@ -759,15 +711,12 @@ public java.util.List getKeysList() { } } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ public int getKeysCount() { if (keysBuilder_ == null) { @@ -777,15 +726,12 @@ public int getKeysCount() { } } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.datastore.v1.Key getKeys(int index) { if (keysBuilder_ == null) { @@ -795,17 +741,15 @@ public com.google.datastore.v1.Key getKeys(int index) { } } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public Builder setKeys(int index, com.google.datastore.v1.Key value) { + public Builder setKeys( + int index, com.google.datastore.v1.Key value) { if (keysBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -819,17 +763,15 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) { return this; } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) { + public Builder setKeys( + int index, com.google.datastore.v1.Key.Builder builderForValue) { if (keysBuilder_ == null) { ensureKeysIsMutable(); keys_.set(index, builderForValue.build()); @@ -840,15 +782,12 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor return this; } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ public Builder addKeys(com.google.datastore.v1.Key value) { if (keysBuilder_ == null) { @@ -864,17 +803,15 @@ public Builder addKeys(com.google.datastore.v1.Key value) { return this; } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public Builder addKeys(int index, com.google.datastore.v1.Key value) { + public Builder addKeys( + int index, com.google.datastore.v1.Key value) { if (keysBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -888,17 +825,15 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) { return this; } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) { + public Builder addKeys( + com.google.datastore.v1.Key.Builder builderForValue) { if (keysBuilder_ == null) { ensureKeysIsMutable(); keys_.add(builderForValue.build()); @@ -909,17 +844,15 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) { return this; } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) { + public Builder addKeys( + int index, com.google.datastore.v1.Key.Builder builderForValue) { if (keysBuilder_ == null) { ensureKeysIsMutable(); keys_.add(index, builderForValue.build()); @@ -930,20 +863,19 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor return this; } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public Builder addAllKeys(java.lang.Iterable values) { + public Builder addAllKeys( + java.lang.Iterable values) { if (keysBuilder_ == null) { ensureKeysIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll(values, keys_); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, keys_); onChanged(); } else { keysBuilder_.addAllMessages(values); @@ -951,15 +883,12 @@ public Builder addAllKeys(java.lang.Iterable * Required. A list of keys with incomplete key paths for which to allocate IDs. * No key may be reserved/read-only. * * - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ public Builder clearKeys() { if (keysBuilder_ == null) { @@ -972,15 +901,12 @@ public Builder clearKeys() { return this; } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ public Builder removeKeys(int index) { if (keysBuilder_ == null) { @@ -993,49 +919,42 @@ public Builder removeKeys(int index) { return this; } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) { + public com.google.datastore.v1.Key.Builder getKeysBuilder( + int index) { return getKeysFieldBuilder().getBuilder(index); } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) { + public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index) { if (keysBuilder_ == null) { - return keys_.get(index); - } else { + return keys_.get(index); } else { return keysBuilder_.getMessageOrBuilder(index); } } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public java.util.List getKeysOrBuilderList() { + public java.util.List + getKeysOrBuilderList() { if (keysBuilder_ != null) { return keysBuilder_.getMessageOrBuilderList(); } else { @@ -1043,68 +962,59 @@ public java.util.List getKeysOrB } } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ public com.google.datastore.v1.Key.Builder addKeysBuilder() { - return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance()); + return getKeysFieldBuilder().addBuilder( + com.google.datastore.v1.Key.getDefaultInstance()); } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) { - return getKeysFieldBuilder() - .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance()); + public com.google.datastore.v1.Key.Builder addKeysBuilder( + int index) { + return getKeysFieldBuilder().addBuilder( + index, com.google.datastore.v1.Key.getDefaultInstance()); } /** - * - * * 
      * Required. A list of keys with incomplete key paths for which to allocate IDs.
      * No key may be reserved/read-only.
      *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - public java.util.List getKeysBuilderList() { + public java.util.List + getKeysBuilderList() { return getKeysFieldBuilder().getBuilderList(); } - private com.google.protobuf.RepeatedFieldBuilderV3< - com.google.datastore.v1.Key, - com.google.datastore.v1.Key.Builder, - com.google.datastore.v1.KeyOrBuilder> + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> getKeysFieldBuilder() { if (keysBuilder_ == null) { - keysBuilder_ = - new com.google.protobuf.RepeatedFieldBuilderV3< - com.google.datastore.v1.Key, - com.google.datastore.v1.Key.Builder, - com.google.datastore.v1.KeyOrBuilder>( - keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( + keys_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); keys_ = null; } return keysBuilder_; } - @java.lang.Override - public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } @@ -1114,12 +1024,12 @@ public final Builder mergeUnknownFields( return super.mergeUnknownFields(unknownFields); } + // @@protoc_insertion_point(builder_scope:google.datastore.v1.AllocateIdsRequest) } // @@protoc_insertion_point(class_scope:google.datastore.v1.AllocateIdsRequest) private static final com.google.datastore.v1.AllocateIdsRequest DEFAULT_INSTANCE; - static { DEFAULT_INSTANCE = new com.google.datastore.v1.AllocateIdsRequest(); } @@ -1128,16 +1038,16 @@ public static com.google.datastore.v1.AllocateIdsRequest getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - @java.lang.Override - public AllocateIdsRequest parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new AllocateIdsRequest(input, extensionRegistry); - } - }; + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public AllocateIdsRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new AllocateIdsRequest(input, extensionRegistry); + } + }; public static com.google.protobuf.Parser parser() { return PARSER; @@ -1152,4 +1062,6 @@ public com.google.protobuf.Parser getParserForType() { public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } + } + diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java index 34e9db57b..4c0b8d1f5 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequestOrBuilder.java @@ -18,94 +18,76 @@ package com.google.datastore.v1; -public interface AllocateIdsRequestOrBuilder - extends +public interface AllocateIdsRequestOrBuilder extends // @@protoc_insertion_point(interface_extends:google.datastore.v1.AllocateIdsRequest) com.google.protobuf.MessageOrBuilder { /** - * - * * 
    * Required. The ID of the project against which to make the request.
    *
* * string project_id = 8 [(.google.api.field_behavior) = REQUIRED]; - * * @return The projectId. */ java.lang.String getProjectId(); /** - * - * * 
    * Required. The ID of the project against which to make the request.
    *
* * string project_id = 8 [(.google.api.field_behavior) = REQUIRED]; - * * @return The bytes for projectId. */ - com.google.protobuf.ByteString getProjectIdBytes(); + com.google.protobuf.ByteString + getProjectIdBytes(); /** - * - * * 
    * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - java.util.List getKeysList(); + java.util.List + getKeysList(); /** - * - * * 
    * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ com.google.datastore.v1.Key getKeys(int index); /** - * - * * 
    * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ int getKeysCount(); /** - * - * * 
    * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - java.util.List getKeysOrBuilderList(); + java.util.List + getKeysOrBuilderList(); /** - * - * * 
    * Required. A list of keys with incomplete key paths for which to allocate IDs.
    * No key may be reserved/read-only.
    *
* - * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; - * + * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED]; */ - com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index); + com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder( + int index); } diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java index 7040cbbfa..30a38fe6e 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java @@ -19,39 +19,37 @@ package com.google.datastore.v1; /** - * - * * 
  * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
  *
* * Protobuf type {@code google.datastore.v1.AllocateIdsResponse} */ -public final class AllocateIdsResponse extends com.google.protobuf.GeneratedMessageV3 - implements +public final class AllocateIdsResponse extends + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:google.datastore.v1.AllocateIdsResponse) AllocateIdsResponseOrBuilder { - private static final long serialVersionUID = 0L; +private static final long serialVersionUID = 0L; // Use AllocateIdsResponse.newBuilder() to construct. private AllocateIdsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private AllocateIdsResponse() { keys_ = java.util.Collections.emptyList(); } @java.lang.Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { return new AllocateIdsResponse(); } @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - private AllocateIdsResponse( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -71,28 +69,29 @@ private AllocateIdsResponse( case 0: done = true; break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - keys_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); - break; + case 10: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + keys_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; + keys_.add( + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry)); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { keys_ = java.util.Collections.unmodifiableList(keys_); @@ -101,27 +100,22 @@ private AllocateIdsResponse( makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.datastore.v1.DatastoreProto - .internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.google.datastore.v1.DatastoreProto - .internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable + return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.google.datastore.v1.AllocateIdsResponse.class, - com.google.datastore.v1.AllocateIdsResponse.Builder.class); + com.google.datastore.v1.AllocateIdsResponse.class, com.google.datastore.v1.AllocateIdsResponse.Builder.class); } public static final int KEYS_FIELD_NUMBER = 1; private java.util.List keys_; /** - * - * * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -133,8 +127,6 @@ public java.util.List getKeysList() {
     return keys_;
   }
   /**
-   *
-   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -142,12 +134,11 @@ public java.util.List getKeysList() {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  public java.util.List getKeysOrBuilderList() {
+  public java.util.List 
+      getKeysOrBuilderList() {
     return keys_;
   }
   /**
-   *
-   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -159,8 +150,6 @@ public int getKeysCount() {
     return keys_.size();
   }
   /**
-   *
-   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -172,8 +161,6 @@ public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
   /**
-   *
-   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -181,12 +168,12 @@ public com.google.datastore.v1.Key getKeys(int index) {
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
+  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
+      int index) {
     return keys_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -198,7 +185,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(1, keys_.get(i));
     }
@@ -212,7 +200,8 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < keys_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, keys_.get(i));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -222,15 +211,15 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.AllocateIdsResponse)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.AllocateIdsResponse other =
-        (com.google.datastore.v1.AllocateIdsResponse) obj;
+    com.google.datastore.v1.AllocateIdsResponse other = (com.google.datastore.v1.AllocateIdsResponse) obj;
 
-    if (!getKeysList().equals(other.getKeysList())) return false;
+    if (!getKeysList()
+        .equals(other.getKeysList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -251,127 +240,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.AllocateIdsResponse parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.AllocateIdsResponse parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.AllocateIdsResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.AllocateIdsResponse parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.AllocateIdsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.AllocateIdsResponse}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.AllocateIdsResponse)
       com.google.datastore.v1.AllocateIdsResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.AllocateIdsResponse.class,
-              com.google.datastore.v1.AllocateIdsResponse.Builder.class);
+              com.google.datastore.v1.AllocateIdsResponse.class, com.google.datastore.v1.AllocateIdsResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.AllocateIdsResponse.newBuilder()
@@ -379,17 +359,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getKeysFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -403,9 +383,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
     }
 
     @java.lang.Override
@@ -424,8 +404,7 @@ public com.google.datastore.v1.AllocateIdsResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.AllocateIdsResponse buildPartial() {
-      com.google.datastore.v1.AllocateIdsResponse result =
-          new com.google.datastore.v1.AllocateIdsResponse(this);
+      com.google.datastore.v1.AllocateIdsResponse result = new com.google.datastore.v1.AllocateIdsResponse(this);
       int from_bitField0_ = bitField0_;
       if (keysBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -444,39 +423,38 @@ public com.google.datastore.v1.AllocateIdsResponse buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.AllocateIdsResponse) {
-        return mergeFrom((com.google.datastore.v1.AllocateIdsResponse) other);
+        return mergeFrom((com.google.datastore.v1.AllocateIdsResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -503,10 +481,9 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsResponse other) {
             keysBuilder_ = null;
             keys_ = other.keys_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            keysBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getKeysFieldBuilder()
-                    : null;
+            keysBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getKeysFieldBuilder() : null;
           } else {
             keysBuilder_.addAllMessages(other.keys_);
           }
@@ -540,27 +517,21 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
-    private java.util.List keys_ = java.util.Collections.emptyList();
-
+    private java.util.List keys_ =
+      java.util.Collections.emptyList();
     private void ensureKeysIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
         bitField0_ |= 0x00000001;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
-        keysBuilder_;
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_;
 
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -576,8 +547,6 @@ public java.util.List getKeysList() {
       }
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -593,8 +562,6 @@ public int getKeysCount() {
       }
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -610,8 +577,6 @@ public com.google.datastore.v1.Key getKeys(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -619,7 +584,8 @@ public com.google.datastore.v1.Key getKeys(int index) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder setKeys(int index, com.google.datastore.v1.Key value) {
+    public Builder setKeys(
+        int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -633,8 +599,6 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -642,7 +606,8 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKeys(
+        int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.set(index, builderForValue.build());
@@ -653,8 +618,6 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       return this;
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -676,8 +639,6 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -685,7 +646,8 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(int index, com.google.datastore.v1.Key value) {
+    public Builder addKeys(
+        int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -699,8 +661,6 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -708,7 +668,8 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(
+        com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(builderForValue.build());
@@ -719,8 +680,6 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -728,7 +687,8 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(
+        int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(index, builderForValue.build());
@@ -739,8 +699,6 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       return this;
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -748,10 +706,12 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public Builder addAllKeys(java.lang.Iterable values) {
+    public Builder addAllKeys(
+        java.lang.Iterable values) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, keys_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, keys_);
         onChanged();
       } else {
         keysBuilder_.addAllMessages(values);
@@ -759,8 +719,6 @@ public Builder addAllKeys(java.lang.Iterable
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -779,8 +737,6 @@ public Builder clearKeys() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -799,8 +755,6 @@ public Builder removeKeys(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -808,12 +762,11 @@ public Builder removeKeys(int index) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
+    public com.google.datastore.v1.Key.Builder getKeysBuilder(
+        int index) {
       return getKeysFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -821,16 +774,14 @@ public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
+    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
+        int index) {
       if (keysBuilder_ == null) {
-        return keys_.get(index);
-      } else {
+        return keys_.get(index);  } else {
         return keysBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -838,7 +789,8 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public java.util.List getKeysOrBuilderList() {
+    public java.util.List 
+         getKeysOrBuilderList() {
       if (keysBuilder_ != null) {
         return keysBuilder_.getMessageOrBuilderList();
       } else {
@@ -846,8 +798,6 @@ public java.util.List getKeysOrB
       }
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -856,11 +806,10 @@ public java.util.List getKeysOrB
      * repeated .google.datastore.v1.Key keys = 1;
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
-      return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
+      return getKeysFieldBuilder().addBuilder(
+          com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -868,13 +817,12 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder() {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
-      return getKeysFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
+    public com.google.datastore.v1.Key.Builder addKeysBuilder(
+        int index) {
+      return getKeysFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The keys specified in the request (in the same order), each with
      * its key path completed with a newly allocated ID.
@@ -882,29 +830,27 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
      *
      * repeated .google.datastore.v1.Key keys = 1;
      */
-    public java.util.List getKeysBuilderList() {
+    public java.util.List 
+         getKeysBuilderList() {
       return getKeysFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
         getKeysFieldBuilder() {
       if (keysBuilder_ == null) {
-        keysBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.Key,
-                com.google.datastore.v1.Key.Builder,
-                com.google.datastore.v1.KeyOrBuilder>(
-                keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+                keys_,
+                ((bitField0_ & 0x00000001) != 0),
+                getParentForChildren(),
+                isClean());
         keys_ = null;
       }
       return keysBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -914,12 +860,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.AllocateIdsResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.AllocateIdsResponse)
   private static final com.google.datastore.v1.AllocateIdsResponse DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.AllocateIdsResponse();
   }
@@ -928,16 +874,16 @@ public static com.google.datastore.v1.AllocateIdsResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public AllocateIdsResponse parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new AllocateIdsResponse(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public AllocateIdsResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new AllocateIdsResponse(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -952,4 +898,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
index 1ba60a1b4..5e5e25c54 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponseOrBuilder.java
@@ -18,14 +18,11 @@
 
 package com.google.datastore.v1;
 
-public interface AllocateIdsResponseOrBuilder
-    extends
+public interface AllocateIdsResponseOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.AllocateIdsResponse)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -33,10 +30,9 @@ public interface AllocateIdsResponseOrBuilder
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  java.util.List getKeysList();
+  java.util.List 
+      getKeysList();
   /**
-   *
-   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -46,8 +42,6 @@ public interface AllocateIdsResponseOrBuilder
    */
   com.google.datastore.v1.Key getKeys(int index);
   /**
-   *
-   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -57,8 +51,6 @@ public interface AllocateIdsResponseOrBuilder
    */
   int getKeysCount();
   /**
-   *
-   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -66,10 +58,9 @@ public interface AllocateIdsResponseOrBuilder
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  java.util.List getKeysOrBuilderList();
+  java.util.List 
+      getKeysOrBuilderList();
   /**
-   *
-   *
    * 
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
@@ -77,5 +68,6 @@ public interface AllocateIdsResponseOrBuilder
    *
    * repeated .google.datastore.v1.Key keys = 1;
    */
-  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index);
+  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
+      int index);
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
index 2de3e68b3..6155abe3d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
@@ -19,39 +19,37 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * An array value.
  * 

  *
  * Protobuf type {@code google.datastore.v1.ArrayValue}
  */
-public final class ArrayValue extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class ArrayValue extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ArrayValue)
     ArrayValueOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use ArrayValue.newBuilder() to construct.
   private ArrayValue(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private ArrayValue() {
     values_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new ArrayValue();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private ArrayValue(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -71,29 +69,29 @@ private ArrayValue(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                values_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              values_.add(
-                  input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry));
-              break;
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              values_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            values_.add(
+                input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry));
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) != 0)) {
         values_ = java.util.Collections.unmodifiableList(values_);
@@ -102,27 +100,22 @@ private ArrayValue(
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.EntityProto
-        .internal_static_google_datastore_v1_ArrayValue_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.EntityProto
-        .internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable
+    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.ArrayValue.class,
-            com.google.datastore.v1.ArrayValue.Builder.class);
+            com.google.datastore.v1.ArrayValue.class, com.google.datastore.v1.ArrayValue.Builder.class);
   }
 
   public static final int VALUES_FIELD_NUMBER = 1;
   private java.util.List values_;
   /**
-   *
-   *
    * 
    * Values in the array.
    * The order of values in an array is preserved as long as all values have
@@ -135,8 +128,6 @@ public java.util.List getValuesList() {
     return values_;
   }
   /**
-   *
-   *
    * 
    * Values in the array.
    * The order of values in an array is preserved as long as all values have
@@ -145,12 +136,11 @@ public java.util.List getValuesList() {
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
-  public java.util.List getValuesOrBuilderList() {
+  public java.util.List 
+      getValuesOrBuilderList() {
     return values_;
   }
   /**
-   *
-   *
    * 
    * Values in the array.
    * The order of values in an array is preserved as long as all values have
@@ -163,8 +153,6 @@ public int getValuesCount() {
     return values_.size();
   }
   /**
-   *
-   *
    * 
    * Values in the array.
    * The order of values in an array is preserved as long as all values have
@@ -177,8 +165,6 @@ public com.google.datastore.v1.Value getValues(int index) {
     return values_.get(index);
   }
   /**
-   *
-   *
    * 
    * Values in the array.
    * The order of values in an array is preserved as long as all values have
@@ -187,12 +173,12 @@ public com.google.datastore.v1.Value getValues(int index) {
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
-  public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
+  public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(
+      int index) {
     return values_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -204,7 +190,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     for (int i = 0; i < values_.size(); i++) {
       output.writeMessage(1, values_.get(i));
     }
@@ -218,7 +205,8 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < values_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, values_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, values_.get(i));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -228,14 +216,15 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.ArrayValue)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.ArrayValue other = (com.google.datastore.v1.ArrayValue) obj;
 
-    if (!getValuesList().equals(other.getValuesList())) return false;
+    if (!getValuesList()
+        .equals(other.getValuesList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -256,126 +245,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.ArrayValue parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.ArrayValue parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ArrayValue parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.ArrayValue parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.ArrayValue parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ArrayValue parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ArrayValue parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ArrayValue parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ArrayValue parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ArrayValue parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ArrayValue parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ArrayValue parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ArrayValue parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ArrayValue parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.ArrayValue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * An array value.
    * 

    *
    * Protobuf type {@code google.datastore.v1.ArrayValue}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.ArrayValue)
       com.google.datastore.v1.ArrayValueOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_ArrayValue_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.ArrayValue.class,
-              com.google.datastore.v1.ArrayValue.Builder.class);
+              com.google.datastore.v1.ArrayValue.class, com.google.datastore.v1.ArrayValue.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.ArrayValue.newBuilder()
@@ -383,17 +364,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getValuesFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -407,9 +388,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_ArrayValue_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor;
     }
 
     @java.lang.Override
@@ -447,39 +428,38 @@ public com.google.datastore.v1.ArrayValue buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ArrayValue) {
-        return mergeFrom((com.google.datastore.v1.ArrayValue) other);
+        return mergeFrom((com.google.datastore.v1.ArrayValue)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -506,10 +486,9 @@ public Builder mergeFrom(com.google.datastore.v1.ArrayValue other) {
             valuesBuilder_ = null;
             values_ = other.values_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            valuesBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getValuesFieldBuilder()
-                    : null;
+            valuesBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getValuesFieldBuilder() : null;
           } else {
             valuesBuilder_.addAllMessages(other.values_);
           }
@@ -543,28 +522,21 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
     private java.util.List values_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureValuesIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
         values_ = new java.util.ArrayList(values_);
         bitField0_ |= 0x00000001;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Value,
-            com.google.datastore.v1.Value.Builder,
-            com.google.datastore.v1.ValueOrBuilder>
-        valuesBuilder_;
+        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> valuesBuilder_;
 
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -581,8 +553,6 @@ public java.util.List getValuesList() {
       }
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -599,8 +569,6 @@ public int getValuesCount() {
       }
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -617,8 +585,6 @@ public com.google.datastore.v1.Value getValues(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -627,7 +593,8 @@ public com.google.datastore.v1.Value getValues(int index) {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public Builder setValues(int index, com.google.datastore.v1.Value value) {
+    public Builder setValues(
+        int index, com.google.datastore.v1.Value value) {
       if (valuesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -641,8 +608,6 @@ public Builder setValues(int index, com.google.datastore.v1.Value value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -651,7 +616,8 @@ public Builder setValues(int index, com.google.datastore.v1.Value value) {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public Builder setValues(int index, com.google.datastore.v1.Value.Builder builderForValue) {
+    public Builder setValues(
+        int index, com.google.datastore.v1.Value.Builder builderForValue) {
       if (valuesBuilder_ == null) {
         ensureValuesIsMutable();
         values_.set(index, builderForValue.build());
@@ -662,8 +628,6 @@ public Builder setValues(int index, com.google.datastore.v1.Value.Builder builde
       return this;
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -686,8 +650,6 @@ public Builder addValues(com.google.datastore.v1.Value value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -696,7 +658,8 @@ public Builder addValues(com.google.datastore.v1.Value value) {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public Builder addValues(int index, com.google.datastore.v1.Value value) {
+    public Builder addValues(
+        int index, com.google.datastore.v1.Value value) {
       if (valuesBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -710,8 +673,6 @@ public Builder addValues(int index, com.google.datastore.v1.Value value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -720,7 +681,8 @@ public Builder addValues(int index, com.google.datastore.v1.Value value) {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public Builder addValues(com.google.datastore.v1.Value.Builder builderForValue) {
+    public Builder addValues(
+        com.google.datastore.v1.Value.Builder builderForValue) {
       if (valuesBuilder_ == null) {
         ensureValuesIsMutable();
         values_.add(builderForValue.build());
@@ -731,8 +693,6 @@ public Builder addValues(com.google.datastore.v1.Value.Builder builderForValue)
       return this;
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -741,7 +701,8 @@ public Builder addValues(com.google.datastore.v1.Value.Builder builderForValue)
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public Builder addValues(int index, com.google.datastore.v1.Value.Builder builderForValue) {
+    public Builder addValues(
+        int index, com.google.datastore.v1.Value.Builder builderForValue) {
       if (valuesBuilder_ == null) {
         ensureValuesIsMutable();
         values_.add(index, builderForValue.build());
@@ -752,8 +713,6 @@ public Builder addValues(int index, com.google.datastore.v1.Value.Builder builde
       return this;
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -766,7 +725,8 @@ public Builder addAllValues(
         java.lang.Iterable values) {
       if (valuesBuilder_ == null) {
         ensureValuesIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, values_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, values_);
         onChanged();
       } else {
         valuesBuilder_.addAllMessages(values);
@@ -774,8 +734,6 @@ public Builder addAllValues(
       return this;
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -795,8 +753,6 @@ public Builder clearValues() {
       return this;
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -816,8 +772,6 @@ public Builder removeValues(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -826,12 +780,11 @@ public Builder removeValues(int index) {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public com.google.datastore.v1.Value.Builder getValuesBuilder(int index) {
+    public com.google.datastore.v1.Value.Builder getValuesBuilder(
+        int index) {
       return getValuesFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -840,16 +793,14 @@ public com.google.datastore.v1.Value.Builder getValuesBuilder(int index) {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
+    public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(
+        int index) {
       if (valuesBuilder_ == null) {
-        return values_.get(index);
-      } else {
+        return values_.get(index);  } else {
         return valuesBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -858,8 +809,8 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public java.util.List
-        getValuesOrBuilderList() {
+    public java.util.List 
+         getValuesOrBuilderList() {
       if (valuesBuilder_ != null) {
         return valuesBuilder_.getMessageOrBuilderList();
       } else {
@@ -867,8 +818,6 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -878,11 +827,10 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index) {
      * repeated .google.datastore.v1.Value values = 1;
      */
     public com.google.datastore.v1.Value.Builder addValuesBuilder() {
-      return getValuesFieldBuilder().addBuilder(com.google.datastore.v1.Value.getDefaultInstance());
+      return getValuesFieldBuilder().addBuilder(
+          com.google.datastore.v1.Value.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -891,13 +839,12 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder() {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public com.google.datastore.v1.Value.Builder addValuesBuilder(int index) {
-      return getValuesFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.Value.getDefaultInstance());
+    public com.google.datastore.v1.Value.Builder addValuesBuilder(
+        int index) {
+      return getValuesFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.Value.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Values in the array.
      * The order of values in an array is preserved as long as all values have
@@ -906,29 +853,27 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder(int index) {
      *
      * repeated .google.datastore.v1.Value values = 1;
      */
-    public java.util.List getValuesBuilderList() {
+    public java.util.List 
+         getValuesBuilderList() {
       return getValuesFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Value,
-            com.google.datastore.v1.Value.Builder,
-            com.google.datastore.v1.ValueOrBuilder>
+        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> 
         getValuesFieldBuilder() {
       if (valuesBuilder_ == null) {
-        valuesBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.Value,
-                com.google.datastore.v1.Value.Builder,
-                com.google.datastore.v1.ValueOrBuilder>(
-                values_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        valuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder>(
+                values_,
+                ((bitField0_ & 0x00000001) != 0),
+                getParentForChildren(),
+                isClean());
         values_ = null;
       }
       return valuesBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -938,12 +883,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.ArrayValue)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.ArrayValue)
   private static final com.google.datastore.v1.ArrayValue DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.ArrayValue();
   }
@@ -952,16 +897,16 @@ public static com.google.datastore.v1.ArrayValue getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public ArrayValue parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ArrayValue(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public ArrayValue parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ArrayValue(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -976,4 +921,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
index d0b1fdef5..fcea1a7c7 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValueOrBuilder.java
@@ -18,14 +18,11 @@
 
 package com.google.datastore.v1;
 
-public interface ArrayValueOrBuilder
-    extends
+public interface ArrayValueOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.ArrayValue)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * Values in the array.
    * The order of values in an array is preserved as long as all values have
@@ -34,10 +31,9 @@ public interface ArrayValueOrBuilder
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
-  java.util.List getValuesList();
+  java.util.List 
+      getValuesList();
   /**
-   *
-   *
    * 
    * Values in the array.
    * The order of values in an array is preserved as long as all values have
@@ -48,8 +44,6 @@ public interface ArrayValueOrBuilder
    */
   com.google.datastore.v1.Value getValues(int index);
   /**
-   *
-   *
    * 
    * Values in the array.
    * The order of values in an array is preserved as long as all values have
@@ -60,8 +54,6 @@ public interface ArrayValueOrBuilder
    */
   int getValuesCount();
   /**
-   *
-   *
    * 
    * Values in the array.
    * The order of values in an array is preserved as long as all values have
@@ -70,10 +62,9 @@ public interface ArrayValueOrBuilder
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
-  java.util.List getValuesOrBuilderList();
+  java.util.List 
+      getValuesOrBuilderList();
   /**
-   *
-   *
    * 
    * Values in the array.
    * The order of values in an array is preserved as long as all values have
@@ -82,5 +73,6 @@ public interface ArrayValueOrBuilder
    *
    * repeated .google.datastore.v1.Value values = 1;
    */
-  com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(int index);
+  com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(
+      int index);
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
index 4eeca6e24..034ee37c9 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
@@ -19,39 +19,37 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
  * 

  *
  * Protobuf type {@code google.datastore.v1.BeginTransactionRequest}
  */
-public final class BeginTransactionRequest extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class BeginTransactionRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.BeginTransactionRequest)
     BeginTransactionRequestOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use BeginTransactionRequest.newBuilder() to construct.
   private BeginTransactionRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private BeginTransactionRequest() {
     projectId_ = "";
   }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new BeginTransactionRequest();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private BeginTransactionRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -70,74 +68,65 @@ private BeginTransactionRequest(
           case 0:
             done = true;
             break;
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          case 66: {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              projectId_ = s;
-              break;
+            projectId_ = s;
+            break;
+          }
+          case 82: {
+            com.google.datastore.v1.TransactionOptions.Builder subBuilder = null;
+            if (transactionOptions_ != null) {
+              subBuilder = transactionOptions_.toBuilder();
             }
-          case 82:
-            {
-              com.google.datastore.v1.TransactionOptions.Builder subBuilder = null;
-              if (transactionOptions_ != null) {
-                subBuilder = transactionOptions_.toBuilder();
-              }
-              transactionOptions_ =
-                  input.readMessage(
-                      com.google.datastore.v1.TransactionOptions.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(transactionOptions_);
-                transactionOptions_ = subBuilder.buildPartial();
-              }
-
-              break;
+            transactionOptions_ = input.readMessage(com.google.datastore.v1.TransactionOptions.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(transactionOptions_);
+              transactionOptions_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.BeginTransactionRequest.class,
-            com.google.datastore.v1.BeginTransactionRequest.Builder.class);
+            com.google.datastore.v1.BeginTransactionRequest.class, com.google.datastore.v1.BeginTransactionRequest.Builder.class);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   public java.lang.String getProjectId() {
@@ -145,28 +134,28 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  public com.google.protobuf.ByteString getProjectIdBytes() {
+  public com.google.protobuf.ByteString
+      getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -177,38 +166,28 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   public static final int TRANSACTION_OPTIONS_FIELD_NUMBER = 10;
   private com.google.datastore.v1.TransactionOptions transactionOptions_;
   /**
-   *
-   *
    * 
    * Options for a new transaction.
    * 

    *
    * .google.datastore.v1.TransactionOptions transaction_options = 10;
-   *
    * @return Whether the transactionOptions field is set.
    */
   public boolean hasTransactionOptions() {
     return transactionOptions_ != null;
   }
   /**
-   *
-   *
    * 
    * Options for a new transaction.
    * 

    *
    * .google.datastore.v1.TransactionOptions transaction_options = 10;
-   *
    * @return The transactionOptions.
    */
   public com.google.datastore.v1.TransactionOptions getTransactionOptions() {
-    return transactionOptions_ == null
-        ? com.google.datastore.v1.TransactionOptions.getDefaultInstance()
-        : transactionOptions_;
+    return transactionOptions_ == null ? com.google.datastore.v1.TransactionOptions.getDefaultInstance() : transactionOptions_;
   }
   /**
-   *
-   *
    * 
    * Options for a new transaction.
    * 

@@ -220,7 +199,6 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -232,7 +210,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
     }
@@ -252,7 +231,8 @@ public int getSerializedSize() {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
     }
     if (transactionOptions_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getTransactionOptions());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(10, getTransactionOptions());
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -262,18 +242,19 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.BeginTransactionRequest)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.BeginTransactionRequest other =
-        (com.google.datastore.v1.BeginTransactionRequest) obj;
+    com.google.datastore.v1.BeginTransactionRequest other = (com.google.datastore.v1.BeginTransactionRequest) obj;
 
-    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getProjectId()
+        .equals(other.getProjectId())) return false;
     if (hasTransactionOptions() != other.hasTransactionOptions()) return false;
     if (hasTransactionOptions()) {
-      if (!getTransactionOptions().equals(other.getTransactionOptions())) return false;
+      if (!getTransactionOptions()
+          .equals(other.getTransactionOptions())) return false;
     }
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
@@ -297,127 +278,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.BeginTransactionRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.BeginTransactionRequest parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.BeginTransactionRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.BeginTransactionRequest parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.BeginTransactionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
    * Protobuf type {@code google.datastore.v1.BeginTransactionRequest}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.BeginTransactionRequest)
       com.google.datastore.v1.BeginTransactionRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.BeginTransactionRequest.class,
-              com.google.datastore.v1.BeginTransactionRequest.Builder.class);
+              com.google.datastore.v1.BeginTransactionRequest.class, com.google.datastore.v1.BeginTransactionRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.BeginTransactionRequest.newBuilder()
@@ -425,15 +397,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -449,9 +422,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
     }
 
     @java.lang.Override
@@ -470,8 +443,7 @@ public com.google.datastore.v1.BeginTransactionRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.BeginTransactionRequest buildPartial() {
-      com.google.datastore.v1.BeginTransactionRequest result =
-          new com.google.datastore.v1.BeginTransactionRequest(this);
+      com.google.datastore.v1.BeginTransactionRequest result = new com.google.datastore.v1.BeginTransactionRequest(this);
       result.projectId_ = projectId_;
       if (transactionOptionsBuilder_ == null) {
         result.transactionOptions_ = transactionOptions_;
@@ -486,39 +458,38 @@ public com.google.datastore.v1.BeginTransactionRequest buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.BeginTransactionRequest) {
-        return mergeFrom((com.google.datastore.v1.BeginTransactionRequest) other);
+        return mergeFrom((com.google.datastore.v1.BeginTransactionRequest)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -526,8 +497,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     }
 
     public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other) {
-      if (other == com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance())
-        return this;
+      if (other == com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance()) return this;
       if (!other.getProjectId().isEmpty()) {
         projectId_ = other.projectId_;
         onChanged();
@@ -566,20 +536,18 @@ public Builder mergeFrom(
 
     private java.lang.Object projectId_ = "";
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -588,21 +556,20 @@ public java.lang.String getProjectId() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The bytes for projectId.
      */
-    public com.google.protobuf.ByteString getProjectIdBytes() {
+    public com.google.protobuf.ByteString
+        getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -610,61 +577,54 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectId(java.lang.String value) {
+    public Builder setProjectId(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
+      
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The bytes for projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       projectId_ = value;
       onChanged();
       return this;
@@ -672,47 +632,34 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
 
     private com.google.datastore.v1.TransactionOptions transactionOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.TransactionOptions,
-            com.google.datastore.v1.TransactionOptions.Builder,
-            com.google.datastore.v1.TransactionOptionsOrBuilder>
-        transactionOptionsBuilder_;
+        com.google.datastore.v1.TransactionOptions, com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder> transactionOptionsBuilder_;
     /**
-     *
-     *
      * 
      * Options for a new transaction.
      * 

      *
      * .google.datastore.v1.TransactionOptions transaction_options = 10;
-     *
      * @return Whether the transactionOptions field is set.
      */
     public boolean hasTransactionOptions() {
       return transactionOptionsBuilder_ != null || transactionOptions_ != null;
     }
     /**
-     *
-     *
      * 
      * Options for a new transaction.
      * 

      *
      * .google.datastore.v1.TransactionOptions transaction_options = 10;
-     *
      * @return The transactionOptions.
      */
     public com.google.datastore.v1.TransactionOptions getTransactionOptions() {
       if (transactionOptionsBuilder_ == null) {
-        return transactionOptions_ == null
-            ? com.google.datastore.v1.TransactionOptions.getDefaultInstance()
-            : transactionOptions_;
+        return transactionOptions_ == null ? com.google.datastore.v1.TransactionOptions.getDefaultInstance() : transactionOptions_;
       } else {
         return transactionOptionsBuilder_.getMessage();
       }
     }
     /**
-     *
-     *
      * 
      * Options for a new transaction.
      * 

@@ -733,8 +680,6 @@ public Builder setTransactionOptions(com.google.datastore.v1.TransactionOptions
       return this;
     }
     /**
-     *
-     *
      * 
      * Options for a new transaction.
      * 

@@ -753,8 +698,6 @@ public Builder setTransactionOptions(
       return this;
     }
     /**
-     *
-     *
      * 
      * Options for a new transaction.
      * 

@@ -765,9 +708,7 @@ public Builder mergeTransactionOptions(com.google.datastore.v1.TransactionOption
       if (transactionOptionsBuilder_ == null) {
         if (transactionOptions_ != null) {
           transactionOptions_ =
-              com.google.datastore.v1.TransactionOptions.newBuilder(transactionOptions_)
-                  .mergeFrom(value)
-                  .buildPartial();
+            com.google.datastore.v1.TransactionOptions.newBuilder(transactionOptions_).mergeFrom(value).buildPartial();
         } else {
           transactionOptions_ = value;
         }
@@ -779,8 +720,6 @@ public Builder mergeTransactionOptions(com.google.datastore.v1.TransactionOption
       return this;
     }
     /**
-     *
-     *
      * 
      * Options for a new transaction.
      * 

@@ -799,8 +738,6 @@ public Builder clearTransactionOptions() {
       return this;
     }
     /**
-     *
-     *
      * 
      * Options for a new transaction.
      * 

@@ -808,13 +745,11 @@ public Builder clearTransactionOptions() {
      * .google.datastore.v1.TransactionOptions transaction_options = 10;
      */
     public com.google.datastore.v1.TransactionOptions.Builder getTransactionOptionsBuilder() {
-
+      
       onChanged();
       return getTransactionOptionsFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * Options for a new transaction.
      * 

@@ -825,14 +760,11 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions
       if (transactionOptionsBuilder_ != null) {
         return transactionOptionsBuilder_.getMessageOrBuilder();
       } else {
-        return transactionOptions_ == null
-            ? com.google.datastore.v1.TransactionOptions.getDefaultInstance()
-            : transactionOptions_;
+        return transactionOptions_ == null ?
+            com.google.datastore.v1.TransactionOptions.getDefaultInstance() : transactionOptions_;
       }
     }
     /**
-     *
-     *
      * 
      * Options for a new transaction.
      * 

@@ -840,24 +772,21 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions
      * .google.datastore.v1.TransactionOptions transaction_options = 10;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.TransactionOptions,
-            com.google.datastore.v1.TransactionOptions.Builder,
-            com.google.datastore.v1.TransactionOptionsOrBuilder>
+        com.google.datastore.v1.TransactionOptions, com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder> 
         getTransactionOptionsFieldBuilder() {
       if (transactionOptionsBuilder_ == null) {
-        transactionOptionsBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.TransactionOptions,
-                com.google.datastore.v1.TransactionOptions.Builder,
-                com.google.datastore.v1.TransactionOptionsOrBuilder>(
-                getTransactionOptions(), getParentForChildren(), isClean());
+        transactionOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.TransactionOptions, com.google.datastore.v1.TransactionOptions.Builder, com.google.datastore.v1.TransactionOptionsOrBuilder>(
+                getTransactionOptions(),
+                getParentForChildren(),
+                isClean());
         transactionOptions_ = null;
       }
       return transactionOptionsBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -867,12 +796,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.BeginTransactionRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.BeginTransactionRequest)
   private static final com.google.datastore.v1.BeginTransactionRequest DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.BeginTransactionRequest();
   }
@@ -881,16 +810,16 @@ public static com.google.datastore.v1.BeginTransactionRequest getDefaultInstance
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public BeginTransactionRequest parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new BeginTransactionRequest(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public BeginTransactionRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new BeginTransactionRequest(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -905,4 +834,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java
index 50ba8a2ff..70f4aa1ef 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java
@@ -18,63 +18,49 @@
 
 package com.google.datastore.v1;
 
-public interface BeginTransactionRequestOrBuilder
-    extends
+public interface BeginTransactionRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.BeginTransactionRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  com.google.protobuf.ByteString getProjectIdBytes();
+  com.google.protobuf.ByteString
+      getProjectIdBytes();
 
   /**
-   *
-   *
    * 
    * Options for a new transaction.
    * 

    *
    * .google.datastore.v1.TransactionOptions transaction_options = 10;
-   *
    * @return Whether the transactionOptions field is set.
    */
   boolean hasTransactionOptions();
   /**
-   *
-   *
    * 
    * Options for a new transaction.
    * 

    *
    * .google.datastore.v1.TransactionOptions transaction_options = 10;
-   *
    * @return The transactionOptions.
    */
   com.google.datastore.v1.TransactionOptions getTransactionOptions();
   /**
-   *
-   *
    * 
    * Options for a new transaction.
    * 

diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
index b1809c176..fd9b4565d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
@@ -19,39 +19,37 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
  * 

  *
  * Protobuf type {@code google.datastore.v1.BeginTransactionResponse}
  */
-public final class BeginTransactionResponse extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class BeginTransactionResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.BeginTransactionResponse)
     BeginTransactionResponseOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use BeginTransactionResponse.newBuilder() to construct.
   private BeginTransactionResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private BeginTransactionResponse() {
     transaction_ = com.google.protobuf.ByteString.EMPTY;
   }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new BeginTransactionResponse();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private BeginTransactionResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -70,56 +68,51 @@ private BeginTransactionResponse(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              transaction_ = input.readBytes();
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+          case 10: {
+
+            transaction_ = input.readBytes();
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.BeginTransactionResponse.class,
-            com.google.datastore.v1.BeginTransactionResponse.Builder.class);
+            com.google.datastore.v1.BeginTransactionResponse.class, com.google.datastore.v1.BeginTransactionResponse.Builder.class);
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 1;
   private com.google.protobuf.ByteString transaction_;
   /**
-   *
-   *
    * 
    * The transaction identifier (always present).
    * 

    *
    * bytes transaction = 1;
-   *
    * @return The transaction.
    */
   public com.google.protobuf.ByteString getTransaction() {
@@ -127,7 +120,6 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -139,7 +131,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (!transaction_.isEmpty()) {
       output.writeBytes(1, transaction_);
     }
@@ -153,7 +146,8 @@ public int getSerializedSize() {
 
     size = 0;
     if (!transaction_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, transaction_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(1, transaction_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -163,15 +157,15 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.BeginTransactionResponse)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.BeginTransactionResponse other =
-        (com.google.datastore.v1.BeginTransactionResponse) obj;
+    com.google.datastore.v1.BeginTransactionResponse other = (com.google.datastore.v1.BeginTransactionResponse) obj;
 
-    if (!getTransaction().equals(other.getTransaction())) return false;
+    if (!getTransaction()
+        .equals(other.getTransaction())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -190,127 +184,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.BeginTransactionResponse parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  public static com.google.datastore.v1.BeginTransactionResponse parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.BeginTransactionResponse parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.BeginTransactionResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.BeginTransactionResponse parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.BeginTransactionResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
    * Protobuf type {@code google.datastore.v1.BeginTransactionResponse}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.BeginTransactionResponse)
       com.google.datastore.v1.BeginTransactionResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.BeginTransactionResponse.class,
-              com.google.datastore.v1.BeginTransactionResponse.Builder.class);
+              com.google.datastore.v1.BeginTransactionResponse.class, com.google.datastore.v1.BeginTransactionResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.BeginTransactionResponse.newBuilder()
@@ -318,15 +303,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -336,9 +322,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
     }
 
     @java.lang.Override
@@ -357,8 +343,7 @@ public com.google.datastore.v1.BeginTransactionResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.BeginTransactionResponse buildPartial() {
-      com.google.datastore.v1.BeginTransactionResponse result =
-          new com.google.datastore.v1.BeginTransactionResponse(this);
+      com.google.datastore.v1.BeginTransactionResponse result = new com.google.datastore.v1.BeginTransactionResponse(this);
       result.transaction_ = transaction_;
       onBuilt();
       return result;
@@ -368,39 +353,38 @@ public com.google.datastore.v1.BeginTransactionResponse buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.BeginTransactionResponse) {
-        return mergeFrom((com.google.datastore.v1.BeginTransactionResponse) other);
+        return mergeFrom((com.google.datastore.v1.BeginTransactionResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -408,8 +392,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     }
 
     public Builder mergeFrom(com.google.datastore.v1.BeginTransactionResponse other) {
-      if (other == com.google.datastore.v1.BeginTransactionResponse.getDefaultInstance())
-        return this;
+      if (other == com.google.datastore.v1.BeginTransactionResponse.getDefaultInstance()) return this;
       if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
         setTransaction(other.getTransaction());
       }
@@ -444,60 +427,51 @@ public Builder mergeFrom(
 
     private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
     /**
-     *
-     *
      * 
      * The transaction identifier (always present).
      * 

      *
      * bytes transaction = 1;
-     *
      * @return The transaction.
      */
     public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
     }
     /**
-     *
-     *
      * 
      * The transaction identifier (always present).
      * 

      *
      * bytes transaction = 1;
-     *
      * @param value The transaction to set.
      * @return This builder for chaining.
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       transaction_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The transaction identifier (always present).
      * 

      *
      * bytes transaction = 1;
-     *
      * @return This builder for chaining.
      */
     public Builder clearTransaction() {
-
+      
       transaction_ = getDefaultInstance().getTransaction();
       onChanged();
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -507,12 +481,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.BeginTransactionResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.BeginTransactionResponse)
   private static final com.google.datastore.v1.BeginTransactionResponse DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.BeginTransactionResponse();
   }
@@ -521,16 +495,16 @@ public static com.google.datastore.v1.BeginTransactionResponse getDefaultInstanc
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public BeginTransactionResponse parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new BeginTransactionResponse(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public BeginTransactionResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new BeginTransactionResponse(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -545,4 +519,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
index dcd155818..8b3109130 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponseOrBuilder.java
@@ -18,20 +18,16 @@
 
 package com.google.datastore.v1;
 
-public interface BeginTransactionResponseOrBuilder
-    extends
+public interface BeginTransactionResponseOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.BeginTransactionResponse)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The transaction identifier (always present).
    * 

    *
    * bytes transaction = 1;
-   *
    * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
index 8f4f7abae..36f350b6d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
@@ -19,24 +19,21 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
  * 

  *
  * Protobuf type {@code google.datastore.v1.CommitRequest}
  */
-public final class CommitRequest extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class CommitRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.CommitRequest)
     CommitRequestOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use CommitRequest.newBuilder() to construct.
   private CommitRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private CommitRequest() {
     projectId_ = "";
     mode_ = 0;
@@ -45,15 +42,16 @@ private CommitRequest() {
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new CommitRequest();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private CommitRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -73,49 +71,46 @@ private CommitRequest(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              transactionSelectorCase_ = 1;
-              transactionSelector_ = input.readBytes();
-              break;
-            }
-          case 40:
-            {
-              int rawValue = input.readEnum();
+          case 10: {
+            transactionSelectorCase_ = 1;
+            transactionSelector_ = input.readBytes();
+            break;
+          }
+          case 40: {
+            int rawValue = input.readEnum();
 
-              mode_ = rawValue;
-              break;
-            }
-          case 50:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                mutations_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              mutations_.add(
-                  input.readMessage(com.google.datastore.v1.Mutation.parser(), extensionRegistry));
-              break;
+            mode_ = rawValue;
+            break;
+          }
+          case 50: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              mutations_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
             }
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+            mutations_.add(
+                input.readMessage(com.google.datastore.v1.Mutation.parser(), extensionRegistry));
+            break;
+          }
+          case 66: {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              projectId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            projectId_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) != 0)) {
         mutations_ = java.util.Collections.unmodifiableList(mutations_);
@@ -124,35 +119,29 @@ private CommitRequest(
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_CommitRequest_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.CommitRequest.class,
-            com.google.datastore.v1.CommitRequest.Builder.class);
+            com.google.datastore.v1.CommitRequest.class, com.google.datastore.v1.CommitRequest.Builder.class);
   }
 
   /**
-   *
-   *
    * 
    * The modes available for commits.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.CommitRequest.Mode}
    */
-  public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
+  public enum Mode
+      implements com.google.protobuf.ProtocolMessageEnum {
     /**
-     *
-     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -161,8 +150,6 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
      */
     MODE_UNSPECIFIED(0),
     /**
-     *
-     *
      * 
      * Transactional: The mutations are either all applied, or none are applied.
      * Learn about transactions
@@ -173,8 +160,6 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
      */
     TRANSACTIONAL(1),
     /**
-     *
-     *
      * 
      * Non-transactional: The mutations may not apply as all or none.
      * 

@@ -186,8 +171,6 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
     ;
 
     /**
-     *
-     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -196,8 +179,6 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int MODE_UNSPECIFIED_VALUE = 0;
     /**
-     *
-     *
      * 
      * Transactional: The mutations are either all applied, or none are applied.
      * Learn about transactions
@@ -208,8 +189,6 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int TRANSACTIONAL_VALUE = 1;
     /**
-     *
-     *
      * 
      * Non-transactional: The mutations may not apply as all or none.
      * 

@@ -218,6 +197,7 @@ public enum Mode implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int NON_TRANSACTIONAL_VALUE = 2;
 
+
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -242,45 +222,45 @@ public static Mode valueOf(int value) {
      */
     public static Mode forNumber(int value) {
       switch (value) {
-        case 0:
-          return MODE_UNSPECIFIED;
-        case 1:
-          return TRANSACTIONAL;
-        case 2:
-          return NON_TRANSACTIONAL;
-        default:
-          return null;
+        case 0: return MODE_UNSPECIFIED;
+        case 1: return TRANSACTIONAL;
+        case 2: return NON_TRANSACTIONAL;
+        default: return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
       return internalValueMap;
     }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        Mode> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public Mode findValueByNumber(int number) {
+              return Mode.forNumber(number);
+            }
+          };
 
-    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap() {
-          public Mode findValueByNumber(int number) {
-            return Mode.forNumber(number);
-          }
-        };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-
-    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
       return getDescriptor();
     }
-
-    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
       return com.google.datastore.v1.CommitRequest.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final Mode[] VALUES = values();
 
-    public static Mode valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static Mode valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -299,15 +279,12 @@ private Mode(int value) {
 
   private int transactionSelectorCase_ = 0;
   private java.lang.Object transactionSelector_;
-
   public enum TransactionSelectorCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
+      implements com.google.protobuf.Internal.EnumLite,
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     TRANSACTION(1),
     TRANSACTIONSELECTOR_NOT_SET(0);
     private final int value;
-
     private TransactionSelectorCase(int value) {
       this.value = value;
     }
@@ -323,35 +300,30 @@ public static TransactionSelectorCase valueOf(int value) {
 
     public static TransactionSelectorCase forNumber(int value) {
       switch (value) {
-        case 1:
-          return TRANSACTION;
-        case 0:
-          return TRANSACTIONSELECTOR_NOT_SET;
-        default:
-          return null;
+        case 1: return TRANSACTION;
+        case 0: return TRANSACTIONSELECTOR_NOT_SET;
+        default: return null;
       }
     }
-
     public int getNumber() {
       return this.value;
     }
   };
 
-  public TransactionSelectorCase getTransactionSelectorCase() {
-    return TransactionSelectorCase.forNumber(transactionSelectorCase_);
+  public TransactionSelectorCase
+  getTransactionSelectorCase() {
+    return TransactionSelectorCase.forNumber(
+        transactionSelectorCase_);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   public java.lang.String getProjectId() {
@@ -359,28 +331,28 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  public com.google.protobuf.ByteString getProjectIdBytes() {
+  public com.google.protobuf.ByteString
+      getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -391,41 +363,32 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   public static final int MODE_FIELD_NUMBER = 5;
   private int mode_;
   /**
-   *
-   *
    * 
    * The type of commit to perform. Defaults to `TRANSACTIONAL`.
    * 

    *
    * .google.datastore.v1.CommitRequest.Mode mode = 5;
-   *
    * @return The enum numeric value on the wire for mode.
    */
   public int getModeValue() {
     return mode_;
   }
   /**
-   *
-   *
    * 
    * The type of commit to perform. Defaults to `TRANSACTIONAL`.
    * 

    *
    * .google.datastore.v1.CommitRequest.Mode mode = 5;
-   *
    * @return The mode.
    */
   public com.google.datastore.v1.CommitRequest.Mode getMode() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.CommitRequest.Mode result =
-        com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
+    com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
     return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result;
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 1;
   /**
-   *
-   *
    * 
    * The identifier of the transaction associated with the commit. A
    * transaction identifier is returned by a call to
@@ -433,7 +396,6 @@ public com.google.datastore.v1.CommitRequest.Mode getMode() {
    * 

    *
    * bytes transaction = 1;
-   *
    * @return The transaction.
    */
   public com.google.protobuf.ByteString getTransaction() {
@@ -446,8 +408,6 @@ public com.google.protobuf.ByteString getTransaction() {
   public static final int MUTATIONS_FIELD_NUMBER = 6;
   private java.util.List mutations_;
   /**
-   *
-   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -467,8 +427,6 @@ public java.util.List getMutationsList() {
     return mutations_;
   }
   /**
-   *
-   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -484,13 +442,11 @@ public java.util.List getMutationsList() {
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
-  public java.util.List
+  public java.util.List 
       getMutationsOrBuilderList() {
     return mutations_;
   }
   /**
-   *
-   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -510,8 +466,6 @@ public int getMutationsCount() {
     return mutations_.size();
   }
   /**
-   *
-   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -531,8 +485,6 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
     return mutations_.get(index);
   }
   /**
-   *
-   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -548,12 +500,12 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
-  public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index) {
+  public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(
+      int index) {
     return mutations_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -565,9 +517,11 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (transactionSelectorCase_ == 1) {
-      output.writeBytes(1, (com.google.protobuf.ByteString) transactionSelector_);
+      output.writeBytes(
+          1, (com.google.protobuf.ByteString) transactionSelector_);
     }
     if (mode_ != com.google.datastore.v1.CommitRequest.Mode.MODE_UNSPECIFIED.getNumber()) {
       output.writeEnum(5, mode_);
@@ -588,15 +542,17 @@ public int getSerializedSize() {
 
     size = 0;
     if (transactionSelectorCase_ == 1) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeBytesSize(
-              1, (com.google.protobuf.ByteString) transactionSelector_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(
+            1, (com.google.protobuf.ByteString) transactionSelector_);
     }
     if (mode_ != com.google.datastore.v1.CommitRequest.Mode.MODE_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream.computeEnumSize(5, mode_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(5, mode_);
     }
     for (int i = 0; i < mutations_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, mutations_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(6, mutations_.get(i));
     }
     if (!getProjectIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
@@ -609,20 +565,23 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.CommitRequest)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.CommitRequest other = (com.google.datastore.v1.CommitRequest) obj;
 
-    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getProjectId()
+        .equals(other.getProjectId())) return false;
     if (mode_ != other.mode_) return false;
-    if (!getMutationsList().equals(other.getMutationsList())) return false;
+    if (!getMutationsList()
+        .equals(other.getMutationsList())) return false;
     if (!getTransactionSelectorCase().equals(other.getTransactionSelectorCase())) return false;
     switch (transactionSelectorCase_) {
       case 1:
-        if (!getTransaction().equals(other.getTransaction())) return false;
+        if (!getTransaction()
+            .equals(other.getTransaction())) return false;
         break;
       case 0:
       default:
@@ -659,126 +618,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.CommitRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.CommitRequest parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.CommitRequest parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.CommitRequest parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.CommitRequest parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.CommitRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CommitRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.CommitRequest parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CommitRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.CommitRequest parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CommitRequest parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.CommitRequest parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CommitRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.CommitRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.CommitRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
    * 

    *
    * Protobuf type {@code google.datastore.v1.CommitRequest}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.CommitRequest)
       com.google.datastore.v1.CommitRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_CommitRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.CommitRequest.class,
-              com.google.datastore.v1.CommitRequest.Builder.class);
+              com.google.datastore.v1.CommitRequest.class, com.google.datastore.v1.CommitRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.CommitRequest.newBuilder()
@@ -786,17 +737,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getMutationsFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -816,9 +767,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_CommitRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor;
     }
 
     @java.lang.Override
@@ -837,8 +788,7 @@ public com.google.datastore.v1.CommitRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.CommitRequest buildPartial() {
-      com.google.datastore.v1.CommitRequest result =
-          new com.google.datastore.v1.CommitRequest(this);
+      com.google.datastore.v1.CommitRequest result = new com.google.datastore.v1.CommitRequest(this);
       int from_bitField0_ = bitField0_;
       result.projectId_ = projectId_;
       result.mode_ = mode_;
@@ -863,39 +813,38 @@ public com.google.datastore.v1.CommitRequest buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.CommitRequest) {
-        return mergeFrom((com.google.datastore.v1.CommitRequest) other);
+        return mergeFrom((com.google.datastore.v1.CommitRequest)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -929,25 +878,22 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
             mutationsBuilder_ = null;
             mutations_ = other.mutations_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            mutationsBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getMutationsFieldBuilder()
-                    : null;
+            mutationsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getMutationsFieldBuilder() : null;
           } else {
             mutationsBuilder_.addAllMessages(other.mutations_);
           }
         }
       }
       switch (other.getTransactionSelectorCase()) {
-        case TRANSACTION:
-          {
-            setTransaction(other.getTransaction());
-            break;
-          }
-        case TRANSACTIONSELECTOR_NOT_SET:
-          {
-            break;
-          }
+        case TRANSACTION: {
+          setTransaction(other.getTransaction());
+          break;
+        }
+        case TRANSACTIONSELECTOR_NOT_SET: {
+          break;
+        }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -977,12 +923,12 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int transactionSelectorCase_ = 0;
     private java.lang.Object transactionSelector_;
-
-    public TransactionSelectorCase getTransactionSelectorCase() {
-      return TransactionSelectorCase.forNumber(transactionSelectorCase_);
+    public TransactionSelectorCase
+        getTransactionSelectorCase() {
+      return TransactionSelectorCase.forNumber(
+          transactionSelectorCase_);
     }
 
     public Builder clearTransactionSelector() {
@@ -996,20 +942,18 @@ public Builder clearTransactionSelector() {
 
     private java.lang.Object projectId_ = "";
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -1018,21 +962,20 @@ public java.lang.String getProjectId() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The bytes for projectId.
      */
-    public com.google.protobuf.ByteString getProjectIdBytes() {
+    public com.google.protobuf.ByteString
+        getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -1040,61 +983,54 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectId(java.lang.String value) {
+    public Builder setProjectId(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
+      
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The bytes for projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       projectId_ = value;
       onChanged();
       return this;
@@ -1102,28 +1038,22 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
 
     private int mode_ = 0;
     /**
-     *
-     *
      * 
      * The type of commit to perform. Defaults to `TRANSACTIONAL`.
      * 

      *
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
-     *
      * @return The enum numeric value on the wire for mode.
      */
     public int getModeValue() {
       return mode_;
     }
     /**
-     *
-     *
      * 
      * The type of commit to perform. Defaults to `TRANSACTIONAL`.
      * 

      *
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
-     *
      * @param value The enum numeric value on the wire for mode to set.
      * @return This builder for chaining.
      */
@@ -1133,31 +1063,24 @@ public Builder setModeValue(int value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The type of commit to perform. Defaults to `TRANSACTIONAL`.
      * 

      *
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
-     *
      * @return The mode.
      */
     public com.google.datastore.v1.CommitRequest.Mode getMode() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.CommitRequest.Mode result =
-          com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
+      com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
       return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result;
     }
     /**
-     *
-     *
      * 
      * The type of commit to perform. Defaults to `TRANSACTIONAL`.
      * 

      *
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
-     *
      * @param value The mode to set.
      * @return This builder for chaining.
      */
@@ -1165,32 +1088,27 @@ public Builder setMode(com.google.datastore.v1.CommitRequest.Mode value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      
       mode_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The type of commit to perform. Defaults to `TRANSACTIONAL`.
      * 

      *
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
-     *
      * @return This builder for chaining.
      */
     public Builder clearMode() {
-
+      
       mode_ = 0;
       onChanged();
       return this;
     }
 
     /**
-     *
-     *
      * 
      * The identifier of the transaction associated with the commit. A
      * transaction identifier is returned by a call to
@@ -1198,7 +1116,6 @@ public Builder clearMode() {
      * 

      *
      * bytes transaction = 1;
-     *
      * @return The transaction.
      */
     public com.google.protobuf.ByteString getTransaction() {
@@ -1208,8 +1125,6 @@ public com.google.protobuf.ByteString getTransaction() {
       return com.google.protobuf.ByteString.EMPTY;
     }
     /**
-     *
-     *
      * 
      * The identifier of the transaction associated with the commit. A
      * transaction identifier is returned by a call to
@@ -1217,22 +1132,19 @@ public com.google.protobuf.ByteString getTransaction() {
      * 

      *
      * bytes transaction = 1;
-     *
      * @param value The transaction to set.
      * @return This builder for chaining.
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      transactionSelectorCase_ = 1;
+    throw new NullPointerException();
+  }
+  transactionSelectorCase_ = 1;
       transactionSelector_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The identifier of the transaction associated with the commit. A
      * transaction identifier is returned by a call to
@@ -1240,7 +1152,6 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes transaction = 1;
-     *
      * @return This builder for chaining.
      */
     public Builder clearTransaction() {
@@ -1253,24 +1164,18 @@ public Builder clearTransaction() {
     }
 
     private java.util.List mutations_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureMutationsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
         mutations_ = new java.util.ArrayList(mutations_);
         bitField0_ |= 0x00000001;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Mutation,
-            com.google.datastore.v1.Mutation.Builder,
-            com.google.datastore.v1.MutationOrBuilder>
-        mutationsBuilder_;
+        com.google.datastore.v1.Mutation, com.google.datastore.v1.Mutation.Builder, com.google.datastore.v1.MutationOrBuilder> mutationsBuilder_;
 
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1294,8 +1199,6 @@ public java.util.List getMutationsList() {
       }
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1319,8 +1222,6 @@ public int getMutationsCount() {
       }
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1344,8 +1245,6 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1361,7 +1260,8 @@ public com.google.datastore.v1.Mutation getMutations(int index) {
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public Builder setMutations(int index, com.google.datastore.v1.Mutation value) {
+    public Builder setMutations(
+        int index, com.google.datastore.v1.Mutation value) {
       if (mutationsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1375,8 +1275,6 @@ public Builder setMutations(int index, com.google.datastore.v1.Mutation value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1404,8 +1302,6 @@ public Builder setMutations(
       return this;
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1435,8 +1331,6 @@ public Builder addMutations(com.google.datastore.v1.Mutation value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1452,7 +1346,8 @@ public Builder addMutations(com.google.datastore.v1.Mutation value) {
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public Builder addMutations(int index, com.google.datastore.v1.Mutation value) {
+    public Builder addMutations(
+        int index, com.google.datastore.v1.Mutation value) {
       if (mutationsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1466,8 +1361,6 @@ public Builder addMutations(int index, com.google.datastore.v1.Mutation value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1483,7 +1376,8 @@ public Builder addMutations(int index, com.google.datastore.v1.Mutation value) {
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public Builder addMutations(com.google.datastore.v1.Mutation.Builder builderForValue) {
+    public Builder addMutations(
+        com.google.datastore.v1.Mutation.Builder builderForValue) {
       if (mutationsBuilder_ == null) {
         ensureMutationsIsMutable();
         mutations_.add(builderForValue.build());
@@ -1494,8 +1388,6 @@ public Builder addMutations(com.google.datastore.v1.Mutation.Builder builderForV
       return this;
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1523,8 +1415,6 @@ public Builder addMutations(
       return this;
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1544,7 +1434,8 @@ public Builder addAllMutations(
         java.lang.Iterable values) {
       if (mutationsBuilder_ == null) {
         ensureMutationsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, mutations_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, mutations_);
         onChanged();
       } else {
         mutationsBuilder_.addAllMessages(values);
@@ -1552,8 +1443,6 @@ public Builder addAllMutations(
       return this;
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1580,8 +1469,6 @@ public Builder clearMutations() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1608,8 +1495,6 @@ public Builder removeMutations(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1625,12 +1510,11 @@ public Builder removeMutations(int index) {
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public com.google.datastore.v1.Mutation.Builder getMutationsBuilder(int index) {
+    public com.google.datastore.v1.Mutation.Builder getMutationsBuilder(
+        int index) {
       return getMutationsFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1646,16 +1530,14 @@ public com.google.datastore.v1.Mutation.Builder getMutationsBuilder(int index) {
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index) {
+    public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(
+        int index) {
       if (mutationsBuilder_ == null) {
-        return mutations_.get(index);
-      } else {
+        return mutations_.get(index);  } else {
         return mutationsBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1671,8 +1553,8 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public java.util.List
-        getMutationsOrBuilderList() {
+    public java.util.List 
+         getMutationsOrBuilderList() {
       if (mutationsBuilder_ != null) {
         return mutationsBuilder_.getMessageOrBuilderList();
       } else {
@@ -1680,8 +1562,6 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index
       }
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1698,12 +1578,10 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
     public com.google.datastore.v1.Mutation.Builder addMutationsBuilder() {
-      return getMutationsFieldBuilder()
-          .addBuilder(com.google.datastore.v1.Mutation.getDefaultInstance());
+      return getMutationsFieldBuilder().addBuilder(
+          com.google.datastore.v1.Mutation.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1719,13 +1597,12 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder() {
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public com.google.datastore.v1.Mutation.Builder addMutationsBuilder(int index) {
-      return getMutationsFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.Mutation.getDefaultInstance());
+    public com.google.datastore.v1.Mutation.Builder addMutationsBuilder(
+        int index) {
+      return getMutationsFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.Mutation.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The mutations to perform.
      * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -1741,29 +1618,27 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder(int index) {
      *
      * repeated .google.datastore.v1.Mutation mutations = 6;
      */
-    public java.util.List getMutationsBuilderList() {
+    public java.util.List 
+         getMutationsBuilderList() {
       return getMutationsFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Mutation,
-            com.google.datastore.v1.Mutation.Builder,
-            com.google.datastore.v1.MutationOrBuilder>
+        com.google.datastore.v1.Mutation, com.google.datastore.v1.Mutation.Builder, com.google.datastore.v1.MutationOrBuilder> 
         getMutationsFieldBuilder() {
       if (mutationsBuilder_ == null) {
-        mutationsBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.Mutation,
-                com.google.datastore.v1.Mutation.Builder,
-                com.google.datastore.v1.MutationOrBuilder>(
-                mutations_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        mutationsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.Mutation, com.google.datastore.v1.Mutation.Builder, com.google.datastore.v1.MutationOrBuilder>(
+                mutations_,
+                ((bitField0_ & 0x00000001) != 0),
+                getParentForChildren(),
+                isClean());
         mutations_ = null;
       }
       return mutationsBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1773,12 +1648,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.CommitRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.CommitRequest)
   private static final com.google.datastore.v1.CommitRequest DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.CommitRequest();
   }
@@ -1787,16 +1662,16 @@ public static com.google.datastore.v1.CommitRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public CommitRequest parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CommitRequest(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public CommitRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new CommitRequest(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1811,4 +1686,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java
index 8f7d76845..a0e2010bc 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java
@@ -18,64 +18,50 @@
 
 package com.google.datastore.v1;
 
-public interface CommitRequestOrBuilder
-    extends
+public interface CommitRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.CommitRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  com.google.protobuf.ByteString getProjectIdBytes();
+  com.google.protobuf.ByteString
+      getProjectIdBytes();
 
   /**
-   *
-   *
    * 
    * The type of commit to perform. Defaults to `TRANSACTIONAL`.
    * 

    *
    * .google.datastore.v1.CommitRequest.Mode mode = 5;
-   *
    * @return The enum numeric value on the wire for mode.
    */
   int getModeValue();
   /**
-   *
-   *
    * 
    * The type of commit to perform. Defaults to `TRANSACTIONAL`.
    * 

    *
    * .google.datastore.v1.CommitRequest.Mode mode = 5;
-   *
    * @return The mode.
    */
   com.google.datastore.v1.CommitRequest.Mode getMode();
 
   /**
-   *
-   *
    * 
    * The identifier of the transaction associated with the commit. A
    * transaction identifier is returned by a call to
@@ -83,14 +69,11 @@ public interface CommitRequestOrBuilder
    * 

    *
    * bytes transaction = 1;
-   *
    * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
 
   /**
-   *
-   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -106,10 +89,9 @@ public interface CommitRequestOrBuilder
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
-  java.util.List getMutationsList();
+  java.util.List 
+      getMutationsList();
   /**
-   *
-   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -127,8 +109,6 @@ public interface CommitRequestOrBuilder
    */
   com.google.datastore.v1.Mutation getMutations(int index);
   /**
-   *
-   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -146,8 +126,6 @@ public interface CommitRequestOrBuilder
    */
   int getMutationsCount();
   /**
-   *
-   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -163,10 +141,9 @@ public interface CommitRequestOrBuilder
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
-  java.util.List getMutationsOrBuilderList();
+  java.util.List 
+      getMutationsOrBuilderList();
   /**
-   *
-   *
    * 
    * The mutations to perform.
    * When mode is `TRANSACTIONAL`, mutations affecting a single entity are
@@ -182,7 +159,8 @@ public interface CommitRequestOrBuilder
    *
    * repeated .google.datastore.v1.Mutation mutations = 6;
    */
-  com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(int index);
+  com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(
+      int index);
 
   public com.google.datastore.v1.CommitRequest.TransactionSelectorCase getTransactionSelectorCase();
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
index d7af5d5fc..e3052ecdb 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
@@ -19,39 +19,37 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The response for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
  * 

  *
  * Protobuf type {@code google.datastore.v1.CommitResponse}
  */
-public final class CommitResponse extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class CommitResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.CommitResponse)
     CommitResponseOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use CommitResponse.newBuilder() to construct.
   private CommitResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private CommitResponse() {
     mutationResults_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new CommitResponse();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private CommitResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -71,36 +69,34 @@ private CommitResponse(
           case 0:
             done = true;
             break;
-          case 26:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                mutationResults_ =
-                    new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              mutationResults_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.MutationResult.parser(), extensionRegistry));
-              break;
+          case 26: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              mutationResults_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
             }
-          case 32:
-            {
-              indexUpdates_ = input.readInt32();
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            mutationResults_.add(
+                input.readMessage(com.google.datastore.v1.MutationResult.parser(), extensionRegistry));
+            break;
+          }
+          case 32: {
+
+            indexUpdates_ = input.readInt32();
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) != 0)) {
         mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_);
@@ -109,27 +105,22 @@ private CommitResponse(
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_CommitResponse_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.CommitResponse.class,
-            com.google.datastore.v1.CommitResponse.Builder.class);
+            com.google.datastore.v1.CommitResponse.class, com.google.datastore.v1.CommitResponse.Builder.class);
   }
 
   public static final int MUTATION_RESULTS_FIELD_NUMBER = 3;
   private java.util.List mutationResults_;
   /**
-   *
-   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -141,8 +132,6 @@ public java.util.List getMutationResults
     return mutationResults_;
   }
   /**
-   *
-   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -150,13 +139,11 @@ public java.util.List getMutationResults
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
-  public java.util.List
+  public java.util.List 
       getMutationResultsOrBuilderList() {
     return mutationResults_;
   }
   /**
-   *
-   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -168,8 +155,6 @@ public int getMutationResultsCount() {
     return mutationResults_.size();
   }
   /**
-   *
-   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -181,8 +166,6 @@ public com.google.datastore.v1.MutationResult getMutationResults(int index) {
     return mutationResults_.get(index);
   }
   /**
-   *
-   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -190,22 +173,20 @@ public com.google.datastore.v1.MutationResult getMutationResults(int index) {
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
-  public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(int index) {
+  public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(
+      int index) {
     return mutationResults_.get(index);
   }
 
   public static final int INDEX_UPDATES_FIELD_NUMBER = 4;
   private int indexUpdates_;
   /**
-   *
-   *
    * 
    * The number of index entries updated during the commit, or zero if none were
    * updated.
    * 

    *
    * int32 index_updates = 4;
-   *
    * @return The indexUpdates.
    */
   public int getIndexUpdates() {
@@ -213,7 +194,6 @@ public int getIndexUpdates() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -225,7 +205,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     for (int i = 0; i < mutationResults_.size(); i++) {
       output.writeMessage(3, mutationResults_.get(i));
     }
@@ -242,10 +223,12 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < mutationResults_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, mutationResults_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, mutationResults_.get(i));
     }
     if (indexUpdates_ != 0) {
-      size += com.google.protobuf.CodedOutputStream.computeInt32Size(4, indexUpdates_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(4, indexUpdates_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -255,15 +238,17 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.CommitResponse)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.CommitResponse other = (com.google.datastore.v1.CommitResponse) obj;
 
-    if (!getMutationResultsList().equals(other.getMutationResultsList())) return false;
-    if (getIndexUpdates() != other.getIndexUpdates()) return false;
+    if (!getMutationResultsList()
+        .equals(other.getMutationResultsList())) return false;
+    if (getIndexUpdates()
+        != other.getIndexUpdates()) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -286,127 +271,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.CommitResponse parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.CommitResponse parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.CommitResponse parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CommitResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.CommitResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CommitResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.CommitResponse parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CommitResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.CommitResponse parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CommitResponse parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.CommitResponse parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CommitResponse parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.CommitResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.CommitResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The response for [Datastore.Commit][google.datastore.v1.Datastore.Commit].
    * 

    *
    * Protobuf type {@code google.datastore.v1.CommitResponse}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.CommitResponse)
       com.google.datastore.v1.CommitResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_CommitResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.CommitResponse.class,
-              com.google.datastore.v1.CommitResponse.Builder.class);
+              com.google.datastore.v1.CommitResponse.class, com.google.datastore.v1.CommitResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.CommitResponse.newBuilder()
@@ -414,17 +390,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getMutationResultsFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -440,9 +416,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_CommitResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor;
     }
 
     @java.lang.Override
@@ -461,8 +437,7 @@ public com.google.datastore.v1.CommitResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.CommitResponse buildPartial() {
-      com.google.datastore.v1.CommitResponse result =
-          new com.google.datastore.v1.CommitResponse(this);
+      com.google.datastore.v1.CommitResponse result = new com.google.datastore.v1.CommitResponse(this);
       int from_bitField0_ = bitField0_;
       if (mutationResultsBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -482,39 +457,38 @@ public com.google.datastore.v1.CommitResponse buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.CommitResponse) {
-        return mergeFrom((com.google.datastore.v1.CommitResponse) other);
+        return mergeFrom((com.google.datastore.v1.CommitResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -541,10 +515,9 @@ public Builder mergeFrom(com.google.datastore.v1.CommitResponse other) {
             mutationResultsBuilder_ = null;
             mutationResults_ = other.mutationResults_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            mutationResultsBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getMutationResultsFieldBuilder()
-                    : null;
+            mutationResultsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getMutationResultsFieldBuilder() : null;
           } else {
             mutationResultsBuilder_.addAllMessages(other.mutationResults_);
           }
@@ -581,29 +554,21 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
     private java.util.List mutationResults_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureMutationResultsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        mutationResults_ =
-            new java.util.ArrayList(mutationResults_);
+        mutationResults_ = new java.util.ArrayList(mutationResults_);
         bitField0_ |= 0x00000001;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.MutationResult,
-            com.google.datastore.v1.MutationResult.Builder,
-            com.google.datastore.v1.MutationResultOrBuilder>
-        mutationResultsBuilder_;
+        com.google.datastore.v1.MutationResult, com.google.datastore.v1.MutationResult.Builder, com.google.datastore.v1.MutationResultOrBuilder> mutationResultsBuilder_;
 
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -619,8 +584,6 @@ public java.util.List getMutationResults
       }
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -636,8 +599,6 @@ public int getMutationResultsCount() {
       }
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -653,8 +614,6 @@ public com.google.datastore.v1.MutationResult getMutationResults(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -662,7 +621,8 @@ public com.google.datastore.v1.MutationResult getMutationResults(int index) {
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public Builder setMutationResults(int index, com.google.datastore.v1.MutationResult value) {
+    public Builder setMutationResults(
+        int index, com.google.datastore.v1.MutationResult value) {
       if (mutationResultsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -676,8 +636,6 @@ public Builder setMutationResults(int index, com.google.datastore.v1.MutationRes
       return this;
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -697,8 +655,6 @@ public Builder setMutationResults(
       return this;
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -720,8 +676,6 @@ public Builder addMutationResults(com.google.datastore.v1.MutationResult value)
       return this;
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -729,7 +683,8 @@ public Builder addMutationResults(com.google.datastore.v1.MutationResult value)
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public Builder addMutationResults(int index, com.google.datastore.v1.MutationResult value) {
+    public Builder addMutationResults(
+        int index, com.google.datastore.v1.MutationResult value) {
       if (mutationResultsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -743,8 +698,6 @@ public Builder addMutationResults(int index, com.google.datastore.v1.MutationRes
       return this;
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -764,8 +717,6 @@ public Builder addMutationResults(
       return this;
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -785,8 +736,6 @@ public Builder addMutationResults(
       return this;
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -798,7 +747,8 @@ public Builder addAllMutationResults(
         java.lang.Iterable values) {
       if (mutationResultsBuilder_ == null) {
         ensureMutationResultsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, mutationResults_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, mutationResults_);
         onChanged();
       } else {
         mutationResultsBuilder_.addAllMessages(values);
@@ -806,8 +756,6 @@ public Builder addAllMutationResults(
       return this;
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -826,8 +774,6 @@ public Builder clearMutationResults() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -846,8 +792,6 @@ public Builder removeMutationResults(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -855,12 +799,11 @@ public Builder removeMutationResults(int index) {
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public com.google.datastore.v1.MutationResult.Builder getMutationResultsBuilder(int index) {
+    public com.google.datastore.v1.MutationResult.Builder getMutationResultsBuilder(
+        int index) {
       return getMutationResultsFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -868,16 +811,14 @@ public com.google.datastore.v1.MutationResult.Builder getMutationResultsBuilder(
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(int index) {
+    public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(
+        int index) {
       if (mutationResultsBuilder_ == null) {
-        return mutationResults_.get(index);
-      } else {
+        return mutationResults_.get(index);  } else {
         return mutationResultsBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -885,8 +826,8 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public java.util.List
-        getMutationResultsOrBuilderList() {
+    public java.util.List 
+         getMutationResultsOrBuilderList() {
       if (mutationResultsBuilder_ != null) {
         return mutationResultsBuilder_.getMessageOrBuilderList();
       } else {
@@ -894,8 +835,6 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
       }
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -904,12 +843,10 @@ public com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuild
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
     public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder() {
-      return getMutationResultsFieldBuilder()
-          .addBuilder(com.google.datastore.v1.MutationResult.getDefaultInstance());
+      return getMutationResultsFieldBuilder().addBuilder(
+          com.google.datastore.v1.MutationResult.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -917,13 +854,12 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(int index) {
-      return getMutationResultsFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.MutationResult.getDefaultInstance());
+    public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
+        int index) {
+      return getMutationResultsFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.MutationResult.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The result of performing the mutations.
      * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -931,22 +867,16 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
      *
      * repeated .google.datastore.v1.MutationResult mutation_results = 3;
      */
-    public java.util.List
-        getMutationResultsBuilderList() {
+    public java.util.List 
+         getMutationResultsBuilderList() {
       return getMutationResultsFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.MutationResult,
-            com.google.datastore.v1.MutationResult.Builder,
-            com.google.datastore.v1.MutationResultOrBuilder>
+        com.google.datastore.v1.MutationResult, com.google.datastore.v1.MutationResult.Builder, com.google.datastore.v1.MutationResultOrBuilder> 
         getMutationResultsFieldBuilder() {
       if (mutationResultsBuilder_ == null) {
-        mutationResultsBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.MutationResult,
-                com.google.datastore.v1.MutationResult.Builder,
-                com.google.datastore.v1.MutationResultOrBuilder>(
+        mutationResultsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.MutationResult, com.google.datastore.v1.MutationResult.Builder, com.google.datastore.v1.MutationResultOrBuilder>(
                 mutationResults_,
                 ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
@@ -956,62 +886,53 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder(
       return mutationResultsBuilder_;
     }
 
-    private int indexUpdates_;
+    private int indexUpdates_ ;
     /**
-     *
-     *
      * 
      * The number of index entries updated during the commit, or zero if none were
      * updated.
      * 

      *
      * int32 index_updates = 4;
-     *
      * @return The indexUpdates.
      */
     public int getIndexUpdates() {
       return indexUpdates_;
     }
     /**
-     *
-     *
      * 
      * The number of index entries updated during the commit, or zero if none were
      * updated.
      * 

      *
      * int32 index_updates = 4;
-     *
      * @param value The indexUpdates to set.
      * @return This builder for chaining.
      */
     public Builder setIndexUpdates(int value) {
-
+      
       indexUpdates_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The number of index entries updated during the commit, or zero if none were
      * updated.
      * 

      *
      * int32 index_updates = 4;
-     *
      * @return This builder for chaining.
      */
     public Builder clearIndexUpdates() {
-
+      
       indexUpdates_ = 0;
       onChanged();
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1021,12 +942,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.CommitResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.CommitResponse)
   private static final com.google.datastore.v1.CommitResponse DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.CommitResponse();
   }
@@ -1035,16 +956,16 @@ public static com.google.datastore.v1.CommitResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public CommitResponse parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CommitResponse(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public CommitResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new CommitResponse(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1059,4 +980,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
index 7394bb2d0..c627cf2a1 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponseOrBuilder.java
@@ -18,14 +18,11 @@
 
 package com.google.datastore.v1;
 
-public interface CommitResponseOrBuilder
-    extends
+public interface CommitResponseOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.CommitResponse)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -33,10 +30,9 @@ public interface CommitResponseOrBuilder
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
-  java.util.List getMutationResultsList();
+  java.util.List 
+      getMutationResultsList();
   /**
-   *
-   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -46,8 +42,6 @@ public interface CommitResponseOrBuilder
    */
   com.google.datastore.v1.MutationResult getMutationResults(int index);
   /**
-   *
-   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -57,8 +51,6 @@ public interface CommitResponseOrBuilder
    */
   int getMutationResultsCount();
   /**
-   *
-   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -66,11 +58,9 @@ public interface CommitResponseOrBuilder
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
-  java.util.List
+  java.util.List 
       getMutationResultsOrBuilderList();
   /**
-   *
-   *
    * 
    * The result of performing the mutations.
    * The i-th mutation result corresponds to the i-th mutation in the request.
@@ -78,18 +68,16 @@ public interface CommitResponseOrBuilder
    *
    * repeated .google.datastore.v1.MutationResult mutation_results = 3;
    */
-  com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(int index);
+  com.google.datastore.v1.MutationResultOrBuilder getMutationResultsOrBuilder(
+      int index);
 
   /**
-   *
-   *
    * 
    * The number of index entries updated during the commit, or zero if none were
    * updated.
    * 

    *
    * int32 index_updates = 4;
-   *
    * @return The indexUpdates.
    */
   int getIndexUpdates();
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
index 90dc8bc51..b84605a43 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
@@ -19,24 +19,21 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A filter that merges multiple other filters using the given operator.
  * 

  *
  * Protobuf type {@code google.datastore.v1.CompositeFilter}
  */
-public final class CompositeFilter extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class CompositeFilter extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.CompositeFilter)
     CompositeFilterOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use CompositeFilter.newBuilder() to construct.
   private CompositeFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private CompositeFilter() {
     op_ = 0;
     filters_ = java.util.Collections.emptyList();
@@ -44,15 +41,16 @@ private CompositeFilter() {
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new CompositeFilter();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private CompositeFilter(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -72,36 +70,35 @@ private CompositeFilter(
           case 0:
             done = true;
             break;
-          case 8:
-            {
-              int rawValue = input.readEnum();
+          case 8: {
+            int rawValue = input.readEnum();
 
-              op_ = rawValue;
-              break;
-            }
-          case 18:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                filters_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              filters_.add(
-                  input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry));
-              break;
+            op_ = rawValue;
+            break;
+          }
+          case 18: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              filters_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            filters_.add(
+                input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry));
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) != 0)) {
         filters_ = java.util.Collections.unmodifiableList(filters_);
@@ -110,35 +107,29 @@ private CompositeFilter(
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_CompositeFilter_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.CompositeFilter.class,
-            com.google.datastore.v1.CompositeFilter.Builder.class);
+            com.google.datastore.v1.CompositeFilter.class, com.google.datastore.v1.CompositeFilter.Builder.class);
   }
 
   /**
-   *
-   *
    * 
    * A composite filter operator.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.CompositeFilter.Operator}
    */
-  public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
+  public enum Operator
+      implements com.google.protobuf.ProtocolMessageEnum {
     /**
-     *
-     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -147,8 +138,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     OPERATOR_UNSPECIFIED(0),
     /**
-     *
-     *
      * 
      * The results are required to satisfy each of the combined filters.
      * 

@@ -160,8 +149,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
     ;
 
     /**
-     *
-     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -170,8 +157,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int OPERATOR_UNSPECIFIED_VALUE = 0;
     /**
-     *
-     *
      * 
      * The results are required to satisfy each of the combined filters.
      * 

@@ -180,6 +165,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int AND_VALUE = 1;
 
+
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -204,43 +190,44 @@ public static Operator valueOf(int value) {
      */
     public static Operator forNumber(int value) {
       switch (value) {
-        case 0:
-          return OPERATOR_UNSPECIFIED;
-        case 1:
-          return AND;
-        default:
-          return null;
+        case 0: return OPERATOR_UNSPECIFIED;
+        case 1: return AND;
+        default: return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
       return internalValueMap;
     }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        Operator> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public Operator findValueByNumber(int number) {
+              return Operator.forNumber(number);
+            }
+          };
 
-    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap() {
-          public Operator findValueByNumber(int number) {
-            return Operator.forNumber(number);
-          }
-        };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-
-    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
       return getDescriptor();
     }
-
-    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
       return com.google.datastore.v1.CompositeFilter.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final Operator[] VALUES = values();
 
-    public static Operator valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static Operator valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -260,42 +247,33 @@ private Operator(int value) {
   public static final int OP_FIELD_NUMBER = 1;
   private int op_;
   /**
-   *
-   *
    * 
    * The operator for combining multiple filters.
    * 

    *
    * .google.datastore.v1.CompositeFilter.Operator op = 1;
-   *
    * @return The enum numeric value on the wire for op.
    */
   public int getOpValue() {
     return op_;
   }
   /**
-   *
-   *
    * 
    * The operator for combining multiple filters.
    * 

    *
    * .google.datastore.v1.CompositeFilter.Operator op = 1;
-   *
    * @return The op.
    */
   public com.google.datastore.v1.CompositeFilter.Operator getOp() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.CompositeFilter.Operator result =
-        com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
+    com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
     return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result;
   }
 
   public static final int FILTERS_FIELD_NUMBER = 2;
   private java.util.List filters_;
   /**
-   *
-   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -307,8 +285,6 @@ public java.util.List getFiltersList() {
     return filters_;
   }
   /**
-   *
-   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -316,13 +292,11 @@ public java.util.List getFiltersList() {
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
-  public java.util.List
+  public java.util.List 
       getFiltersOrBuilderList() {
     return filters_;
   }
   /**
-   *
-   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -334,8 +308,6 @@ public int getFiltersCount() {
     return filters_.size();
   }
   /**
-   *
-   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -347,8 +319,6 @@ public com.google.datastore.v1.Filter getFilters(int index) {
     return filters_.get(index);
   }
   /**
-   *
-   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -356,12 +326,12 @@ public com.google.datastore.v1.Filter getFilters(int index) {
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
-  public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
+  public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(
+      int index) {
     return filters_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -373,7 +343,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (op_ != com.google.datastore.v1.CompositeFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) {
       output.writeEnum(1, op_);
     }
@@ -390,10 +361,12 @@ public int getSerializedSize() {
 
     size = 0;
     if (op_ != com.google.datastore.v1.CompositeFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, op_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, op_);
     }
     for (int i = 0; i < filters_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, filters_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, filters_.get(i));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -403,7 +376,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.CompositeFilter)) {
       return super.equals(obj);
@@ -411,7 +384,8 @@ public boolean equals(final java.lang.Object obj) {
     com.google.datastore.v1.CompositeFilter other = (com.google.datastore.v1.CompositeFilter) obj;
 
     if (op_ != other.op_) return false;
-    if (!getFiltersList().equals(other.getFiltersList())) return false;
+    if (!getFiltersList()
+        .equals(other.getFiltersList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -434,127 +408,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.CompositeFilter parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.CompositeFilter parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.CompositeFilter parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CompositeFilter parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.CompositeFilter parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CompositeFilter parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.CompositeFilter parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CompositeFilter parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.CompositeFilter parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.CompositeFilter parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.CompositeFilter parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.CompositeFilter parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.CompositeFilter parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.CompositeFilter parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.CompositeFilter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A filter that merges multiple other filters using the given operator.
    * 

    *
    * Protobuf type {@code google.datastore.v1.CompositeFilter}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.CompositeFilter)
       com.google.datastore.v1.CompositeFilterOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_CompositeFilter_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.CompositeFilter.class,
-              com.google.datastore.v1.CompositeFilter.Builder.class);
+              com.google.datastore.v1.CompositeFilter.class, com.google.datastore.v1.CompositeFilter.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.CompositeFilter.newBuilder()
@@ -562,17 +527,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getFiltersFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -588,9 +553,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_CompositeFilter_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor;
     }
 
     @java.lang.Override
@@ -609,8 +574,7 @@ public com.google.datastore.v1.CompositeFilter build() {
 
     @java.lang.Override
     public com.google.datastore.v1.CompositeFilter buildPartial() {
-      com.google.datastore.v1.CompositeFilter result =
-          new com.google.datastore.v1.CompositeFilter(this);
+      com.google.datastore.v1.CompositeFilter result = new com.google.datastore.v1.CompositeFilter(this);
       int from_bitField0_ = bitField0_;
       result.op_ = op_;
       if (filtersBuilder_ == null) {
@@ -630,39 +594,38 @@ public com.google.datastore.v1.CompositeFilter buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.CompositeFilter) {
-        return mergeFrom((com.google.datastore.v1.CompositeFilter) other);
+        return mergeFrom((com.google.datastore.v1.CompositeFilter)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -692,10 +655,9 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) {
             filtersBuilder_ = null;
             filters_ = other.filters_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            filtersBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getFiltersFieldBuilder()
-                    : null;
+            filtersBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getFiltersFieldBuilder() : null;
           } else {
             filtersBuilder_.addAllMessages(other.filters_);
           }
@@ -729,33 +691,26 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
     private int op_ = 0;
     /**
-     *
-     *
      * 
      * The operator for combining multiple filters.
      * 

      *
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
-     *
      * @return The enum numeric value on the wire for op.
      */
     public int getOpValue() {
       return op_;
     }
     /**
-     *
-     *
      * 
      * The operator for combining multiple filters.
      * 

      *
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
-     *
      * @param value The enum numeric value on the wire for op to set.
      * @return This builder for chaining.
      */
@@ -765,33 +720,24 @@ public Builder setOpValue(int value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The operator for combining multiple filters.
      * 

      *
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
-     *
      * @return The op.
      */
     public com.google.datastore.v1.CompositeFilter.Operator getOp() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.CompositeFilter.Operator result =
-          com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
-      return result == null
-          ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED
-          : result;
+      com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
+      return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result;
     }
     /**
-     *
-     *
      * 
      * The operator for combining multiple filters.
      * 

      *
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
-     *
      * @param value The op to set.
      * @return This builder for chaining.
      */
@@ -799,48 +745,39 @@ public Builder setOp(com.google.datastore.v1.CompositeFilter.Operator value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      
       op_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The operator for combining multiple filters.
      * 

      *
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
-     *
      * @return This builder for chaining.
      */
     public Builder clearOp() {
-
+      
       op_ = 0;
       onChanged();
       return this;
     }
 
     private java.util.List filters_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureFiltersIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
         filters_ = new java.util.ArrayList(filters_);
         bitField0_ |= 0x00000001;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Filter,
-            com.google.datastore.v1.Filter.Builder,
-            com.google.datastore.v1.FilterOrBuilder>
-        filtersBuilder_;
+        com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> filtersBuilder_;
 
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -856,8 +793,6 @@ public java.util.List getFiltersList() {
       }
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -873,8 +808,6 @@ public int getFiltersCount() {
       }
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -890,8 +823,6 @@ public com.google.datastore.v1.Filter getFilters(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -899,7 +830,8 @@ public com.google.datastore.v1.Filter getFilters(int index) {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public Builder setFilters(int index, com.google.datastore.v1.Filter value) {
+    public Builder setFilters(
+        int index, com.google.datastore.v1.Filter value) {
       if (filtersBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -913,8 +845,6 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -922,7 +852,8 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter value) {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public Builder setFilters(int index, com.google.datastore.v1.Filter.Builder builderForValue) {
+    public Builder setFilters(
+        int index, com.google.datastore.v1.Filter.Builder builderForValue) {
       if (filtersBuilder_ == null) {
         ensureFiltersIsMutable();
         filters_.set(index, builderForValue.build());
@@ -933,8 +864,6 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter.Builder buil
       return this;
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -956,8 +885,6 @@ public Builder addFilters(com.google.datastore.v1.Filter value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -965,7 +892,8 @@ public Builder addFilters(com.google.datastore.v1.Filter value) {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public Builder addFilters(int index, com.google.datastore.v1.Filter value) {
+    public Builder addFilters(
+        int index, com.google.datastore.v1.Filter value) {
       if (filtersBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -979,8 +907,6 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -988,7 +914,8 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter value) {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public Builder addFilters(com.google.datastore.v1.Filter.Builder builderForValue) {
+    public Builder addFilters(
+        com.google.datastore.v1.Filter.Builder builderForValue) {
       if (filtersBuilder_ == null) {
         ensureFiltersIsMutable();
         filters_.add(builderForValue.build());
@@ -999,8 +926,6 @@ public Builder addFilters(com.google.datastore.v1.Filter.Builder builderForValue
       return this;
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1008,7 +933,8 @@ public Builder addFilters(com.google.datastore.v1.Filter.Builder builderForValue
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public Builder addFilters(int index, com.google.datastore.v1.Filter.Builder builderForValue) {
+    public Builder addFilters(
+        int index, com.google.datastore.v1.Filter.Builder builderForValue) {
       if (filtersBuilder_ == null) {
         ensureFiltersIsMutable();
         filters_.add(index, builderForValue.build());
@@ -1019,8 +945,6 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter.Builder buil
       return this;
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1032,7 +956,8 @@ public Builder addAllFilters(
         java.lang.Iterable values) {
       if (filtersBuilder_ == null) {
         ensureFiltersIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, filters_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, filters_);
         onChanged();
       } else {
         filtersBuilder_.addAllMessages(values);
@@ -1040,8 +965,6 @@ public Builder addAllFilters(
       return this;
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1060,8 +983,6 @@ public Builder clearFilters() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1080,8 +1001,6 @@ public Builder removeFilters(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1089,12 +1008,11 @@ public Builder removeFilters(int index) {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public com.google.datastore.v1.Filter.Builder getFiltersBuilder(int index) {
+    public com.google.datastore.v1.Filter.Builder getFiltersBuilder(
+        int index) {
       return getFiltersFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1102,16 +1020,14 @@ public com.google.datastore.v1.Filter.Builder getFiltersBuilder(int index) {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
+    public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(
+        int index) {
       if (filtersBuilder_ == null) {
-        return filters_.get(index);
-      } else {
+        return filters_.get(index);  } else {
         return filtersBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1119,8 +1035,8 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public java.util.List
-        getFiltersOrBuilderList() {
+    public java.util.List 
+         getFiltersOrBuilderList() {
       if (filtersBuilder_ != null) {
         return filtersBuilder_.getMessageOrBuilderList();
       } else {
@@ -1128,8 +1044,6 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1138,12 +1052,10 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
      * repeated .google.datastore.v1.Filter filters = 2;
      */
     public com.google.datastore.v1.Filter.Builder addFiltersBuilder() {
-      return getFiltersFieldBuilder()
-          .addBuilder(com.google.datastore.v1.Filter.getDefaultInstance());
+      return getFiltersFieldBuilder().addBuilder(
+          com.google.datastore.v1.Filter.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1151,13 +1063,12 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder() {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public com.google.datastore.v1.Filter.Builder addFiltersBuilder(int index) {
-      return getFiltersFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.Filter.getDefaultInstance());
+    public com.google.datastore.v1.Filter.Builder addFiltersBuilder(
+        int index) {
+      return getFiltersFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.Filter.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The list of filters to combine.
      * Must contain at least one filter.
@@ -1165,29 +1076,27 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder(int index) {
      *
      * repeated .google.datastore.v1.Filter filters = 2;
      */
-    public java.util.List getFiltersBuilderList() {
+    public java.util.List 
+         getFiltersBuilderList() {
       return getFiltersFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Filter,
-            com.google.datastore.v1.Filter.Builder,
-            com.google.datastore.v1.FilterOrBuilder>
+        com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> 
         getFiltersFieldBuilder() {
       if (filtersBuilder_ == null) {
-        filtersBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.Filter,
-                com.google.datastore.v1.Filter.Builder,
-                com.google.datastore.v1.FilterOrBuilder>(
-                filters_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        filtersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder>(
+                filters_,
+                ((bitField0_ & 0x00000001) != 0),
+                getParentForChildren(),
+                isClean());
         filters_ = null;
       }
       return filtersBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1197,12 +1106,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.CompositeFilter)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.CompositeFilter)
   private static final com.google.datastore.v1.CompositeFilter DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.CompositeFilter();
   }
@@ -1211,16 +1120,16 @@ public static com.google.datastore.v1.CompositeFilter getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public CompositeFilter parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CompositeFilter(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public CompositeFilter parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new CompositeFilter(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1235,4 +1144,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java
index aed9664e8..4bd02a62e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java
@@ -18,39 +18,30 @@
 
 package com.google.datastore.v1;
 
-public interface CompositeFilterOrBuilder
-    extends
+public interface CompositeFilterOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.CompositeFilter)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The operator for combining multiple filters.
    * 

    *
    * .google.datastore.v1.CompositeFilter.Operator op = 1;
-   *
    * @return The enum numeric value on the wire for op.
    */
   int getOpValue();
   /**
-   *
-   *
    * 
    * The operator for combining multiple filters.
    * 

    *
    * .google.datastore.v1.CompositeFilter.Operator op = 1;
-   *
    * @return The op.
    */
   com.google.datastore.v1.CompositeFilter.Operator getOp();
 
   /**
-   *
-   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -58,10 +49,9 @@ public interface CompositeFilterOrBuilder
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
-  java.util.List getFiltersList();
+  java.util.List 
+      getFiltersList();
   /**
-   *
-   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -71,8 +61,6 @@ public interface CompositeFilterOrBuilder
    */
   com.google.datastore.v1.Filter getFilters(int index);
   /**
-   *
-   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -82,8 +70,6 @@ public interface CompositeFilterOrBuilder
    */
   int getFiltersCount();
   /**
-   *
-   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -91,10 +77,9 @@ public interface CompositeFilterOrBuilder
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
-  java.util.List getFiltersOrBuilderList();
+  java.util.List 
+      getFiltersOrBuilderList();
   /**
-   *
-   *
    * 
    * The list of filters to combine.
    * Must contain at least one filter.
@@ -102,5 +87,6 @@ public interface CompositeFilterOrBuilder
    *
    * repeated .google.datastore.v1.Filter filters = 2;
    */
-  com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index);
+  com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(
+      int index);
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
index dc4d63dcc..812840711 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
@@ -20,376 +20,357 @@
 
 public final class DatastoreProto {
   private DatastoreProto() {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
   }
 
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_LookupRequest_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_LookupRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_LookupResponse_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_LookupResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_RunQueryRequest_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_RunQueryRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_RunQueryResponse_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_RunQueryResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_RollbackRequest_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_RollbackRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_RollbackResponse_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_RollbackResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_CommitRequest_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_CommitRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_CommitResponse_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_CommitResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_Mutation_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_Mutation_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Mutation_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_MutationResult_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_MutationResult_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_MutationResult_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_ReadOptions_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_ReadOptions_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_TransactionOptions_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_TransactionOptions_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable;
 
-  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
     return descriptor;
   }
-
-  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n#google/datastore/v1/datastore.proto\022\023g"
-          + "oogle.datastore.v1\032\034google/api/annotatio"
-          + "ns.proto\032\027google/api/client.proto\032\037googl"
-          + "e/api/field_behavior.proto\032 google/datas"
-          + "tore/v1/entity.proto\032\037google/datastore/v"
-          + "1/query.proto\"\215\001\n\rLookupRequest\022\027\n\nproje"
-          + "ct_id\030\010 \001(\tB\003\340A\002\0226\n\014read_options\030\001 \001(\0132 "
-          + ".google.datastore.v1.ReadOptions\022+\n\004keys"
-          + "\030\003 \003(\0132\030.google.datastore.v1.KeyB\003\340A\002\"\242\001"
-          + "\n\016LookupResponse\0220\n\005found\030\001 \003(\0132!.google"
-          + ".datastore.v1.EntityResult\0222\n\007missing\030\002 "
-          + "\003(\0132!.google.datastore.v1.EntityResult\022*"
-          + "\n\010deferred\030\003 \003(\0132\030.google.datastore.v1.K"
-          + "ey\"\211\002\n\017RunQueryRequest\022\027\n\nproject_id\030\010 \001"
-          + "(\tB\003\340A\002\0226\n\014partition_id\030\002 \001(\0132 .google.d"
-          + "atastore.v1.PartitionId\0226\n\014read_options\030"
-          + "\001 \001(\0132 .google.datastore.v1.ReadOptions\022"
-          + "+\n\005query\030\003 \001(\0132\032.google.datastore.v1.Que"
-          + "ryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google.datasto"
-          + "re.v1.GqlQueryH\000B\014\n\nquery_type\"s\n\020RunQue"
-          + "ryResponse\0224\n\005batch\030\001 \001(\0132%.google.datas"
-          + "tore.v1.QueryResultBatch\022)\n\005query\030\002 \001(\0132"
-          + "\032.google.datastore.v1.Query\"x\n\027BeginTran"
-          + "sactionRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022"
-          + "D\n\023transaction_options\030\n \001(\0132\'.google.da"
-          + "tastore.v1.TransactionOptions\"/\n\030BeginTr"
-          + "ansactionResponse\022\023\n\013transaction\030\001 \001(\014\"D"
-          + "\n\017RollbackRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340"
-          + "A\002\022\030\n\013transaction\030\001 \001(\014B\003\340A\002\"\022\n\020Rollback"
-          + "Response\"\210\002\n\rCommitRequest\022\027\n\nproject_id"
-          + "\030\010 \001(\tB\003\340A\002\0225\n\004mode\030\005 \001(\0162\'.google.datas"
-          + "tore.v1.CommitRequest.Mode\022\025\n\013transactio"
-          + "n\030\001 \001(\014H\000\0220\n\tmutations\030\006 \003(\0132\035.google.da"
-          + "tastore.v1.Mutation\"F\n\004Mode\022\024\n\020MODE_UNSP"
-          + "ECIFIED\020\000\022\021\n\rTRANSACTIONAL\020\001\022\025\n\021NON_TRAN"
-          + "SACTIONAL\020\002B\026\n\024transaction_selector\"f\n\016C"
-          + "ommitResponse\022=\n\020mutation_results\030\003 \003(\0132"
-          + "#.google.datastore.v1.MutationResult\022\025\n\r"
-          + "index_updates\030\004 \001(\005\"Z\n\022AllocateIdsReques"
-          + "t\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022+\n\004keys\030\001 \003(\013"
-          + "2\030.google.datastore.v1.KeyB\003\340A\002\"=\n\023Alloc"
-          + "ateIdsResponse\022&\n\004keys\030\001 \003(\0132\030.google.da"
-          + "tastore.v1.Key\"n\n\021ReserveIdsRequest\022\027\n\np"
-          + "roject_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001("
-          + "\t\022+\n\004keys\030\001 \003(\0132\030.google.datastore.v1.Ke"
-          + "yB\003\340A\002\"\024\n\022ReserveIdsResponse\"\207\002\n\010Mutatio"
-          + "n\022-\n\006insert\030\004 \001(\0132\033.google.datastore.v1."
-          + "EntityH\000\022-\n\006update\030\005 \001(\0132\033.google.datast"
-          + "ore.v1.EntityH\000\022-\n\006upsert\030\006 \001(\0132\033.google"
-          + ".datastore.v1.EntityH\000\022*\n\006delete\030\007 \001(\0132\030"
-          + ".google.datastore.v1.KeyH\000\022\026\n\014base_versi"
-          + "on\030\010 \001(\003H\001B\013\n\toperationB\035\n\033conflict_dete"
-          + "ction_strategy\"c\n\016MutationResult\022%\n\003key\030"
-          + "\003 \001(\0132\030.google.datastore.v1.Key\022\017\n\007versi"
-          + "on\030\004 \001(\003\022\031\n\021conflict_detected\030\005 \001(\010\"\325\001\n\013"
-          + "ReadOptions\022L\n\020read_consistency\030\001 \001(\01620."
-          + "google.datastore.v1.ReadOptions.ReadCons"
-          + "istencyH\000\022\025\n\013transaction\030\002 \001(\014H\000\"M\n\017Read"
-          + "Consistency\022 \n\034READ_CONSISTENCY_UNSPECIF"
-          + "IED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020consi"
-          + "stency_type\"\343\001\n\022TransactionOptions\022G\n\nre"
-          + "ad_write\030\001 \001(\01321.google.datastore.v1.Tra"
-          + "nsactionOptions.ReadWriteH\000\022E\n\tread_only"
-          + "\030\002 \001(\01320.google.datastore.v1.Transaction"
-          + "Options.ReadOnlyH\000\032)\n\tReadWrite\022\034\n\024previ"
-          + "ous_transaction\030\001 \001(\014\032\n\n\010ReadOnlyB\006\n\004mod"
-          + "e2\223\n\n\tDatastore\022\235\001\n\006Lookup\022\".google.data"
-          + "store.v1.LookupRequest\032#.google.datastor"
-          + "e.v1.LookupResponse\"J\202\323\344\223\002%\" /v1/project"
-          + "s/{project_id}:lookup:\001*\332A\034project_id,re"
-          + "ad_options,keys\022\206\001\n\010RunQuery\022$.google.da"
-          + "tastore.v1.RunQueryRequest\032%.google.data"
-          + "store.v1.RunQueryResponse\"-\202\323\344\223\002\'\"\"/v1/p"
-          + "rojects/{project_id}:runQuery:\001*\022\263\001\n\020Beg"
-          + "inTransaction\022,.google.datastore.v1.Begi"
-          + "nTransactionRequest\032-.google.datastore.v"
-          + "1.BeginTransactionResponse\"B\202\323\344\223\002/\"*/v1/"
-          + "projects/{project_id}:beginTransaction:\001"
-          + "*\332A\nproject_id\022\302\001\n\006Commit\022\".google.datas"
-          + "tore.v1.CommitRequest\032#.google.datastore"
-          + ".v1.CommitResponse\"o\202\323\344\223\002%\" /v1/projects"
-          + "/{project_id}:commit:\001*\332A%project_id,mod"
-          + "e,transaction,mutations\332A\031project_id,mod"
-          + "e,mutations\022\237\001\n\010Rollback\022$.google.datast"
-          + "ore.v1.RollbackRequest\032%.google.datastor"
-          + "e.v1.RollbackResponse\"F\202\323\344\223\002\'\"\"/v1/proje"
-          + "cts/{project_id}:rollback:\001*\332A\026project_i"
-          + "d,transaction\022\244\001\n\013AllocateIds\022\'.google.d"
-          + "atastore.v1.AllocateIdsRequest\032(.google."
-          + "datastore.v1.AllocateIdsResponse\"B\202\323\344\223\002*"
-          + "\"%/v1/projects/{project_id}:allocateIds:"
-          + "\001*\332A\017project_id,keys\022\240\001\n\nReserveIds\022&.go"
-          + "ogle.datastore.v1.ReserveIdsRequest\032\'.go"
-          + "ogle.datastore.v1.ReserveIdsResponse\"A\202\323"
-          + "\344\223\002)\"$/v1/projects/{project_id}:reserveI"
-          + "ds:\001*\332A\017project_id,keys\032v\312A\030datastore.go"
-          + "ogleapis.com\322AXhttps://www.googleapis.co"
-          + "m/auth/cloud-platform,https://www.google"
-          + "apis.com/auth/datastoreB\241\001\n\027com.google.d"
-          + "atastore.v1B\016DatastoreProtoP\001Z
  * A Datastore data object.
  * An entity is limited to 1 megabyte when stored. That _roughly_
@@ -30,29 +28,30 @@
  *
  * Protobuf type {@code google.datastore.v1.Entity}
  */
-public final class Entity extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class Entity extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Entity)
     EntityOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use Entity.newBuilder() to construct.
   private Entity(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private Entity() {}
+  private Entity() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new Entity();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private Entity(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -72,76 +71,72 @@ private Entity(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              com.google.datastore.v1.Key.Builder subBuilder = null;
-              if (key_ != null) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-
-              break;
+          case 10: {
+            com.google.datastore.v1.Key.Builder subBuilder = null;
+            if (key_ != null) {
+              subBuilder = key_.toBuilder();
             }
-          case 26:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                properties_ =
-                    com.google.protobuf.MapField.newMapField(
-                        PropertiesDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
-              }
-              com.google.protobuf.MapEntry
-                  properties__ =
-                      input.readMessage(
-                          PropertiesDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-              properties_.getMutableMap().put(properties__.getKey(), properties__.getValue());
-              break;
+            key_ = input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(key_);
+              key_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+
+            break;
+          }
+          case 26: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              properties_ = com.google.protobuf.MapField.newMapField(
+                  PropertiesDefaultEntryHolder.defaultEntry);
+              mutable_bitField0_ |= 0x00000001;
+            }
+            com.google.protobuf.MapEntry
+            properties__ = input.readMessage(
+                PropertiesDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+            properties_.getMutableMap().put(
+                properties__.getKey(), properties__.getValue());
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.EntityProto
-        .internal_static_google_datastore_v1_Entity_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapField internalGetMapField(int number) {
+  protected com.google.protobuf.MapField internalGetMapField(
+      int number) {
     switch (number) {
       case 3:
         return internalGetProperties();
       default:
-        throw new RuntimeException("Invalid map field number: " + number);
+        throw new RuntimeException(
+            "Invalid map field number: " + number);
     }
   }
-
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.EntityProto
-        .internal_static_google_datastore_v1_Entity_fieldAccessorTable
+    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.Entity.class, com.google.datastore.v1.Entity.Builder.class);
   }
@@ -149,8 +144,6 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   public static final int KEY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.Key key_;
   /**
-   *
-   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -160,15 +153,12 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    * 

    *
    * .google.datastore.v1.Key key = 1;
-   *
    * @return Whether the key field is set.
    */
   public boolean hasKey() {
     return key_ != null;
   }
   /**
-   *
-   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -178,15 +168,12 @@ public boolean hasKey() {
    * 

    *
    * .google.datastore.v1.Key key = 1;
-   *
    * @return The key.
    */
   public com.google.datastore.v1.Key getKey() {
     return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
   }
   /**
-   *
-   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -202,26 +189,24 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
   }
 
   public static final int PROPERTIES_FIELD_NUMBER = 3;
-
   private static final class PropertiesDefaultEntryHolder {
-    static final com.google.protobuf.MapEntry
-        defaultEntry =
+    static final com.google.protobuf.MapEntry<
+        java.lang.String, com.google.datastore.v1.Value> defaultEntry =
             com.google.protobuf.MapEntry
-                .newDefaultInstance(
-                    com.google.datastore.v1.EntityProto
-                        .internal_static_google_datastore_v1_Entity_PropertiesEntry_descriptor,
-                    com.google.protobuf.WireFormat.FieldType.STRING,
-                    "",
-                    com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                    com.google.datastore.v1.Value.getDefaultInstance());
+            .newDefaultInstance(
+                com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_PropertiesEntry_descriptor, 
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "",
+                com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                com.google.datastore.v1.Value.getDefaultInstance());
   }
-
-  private com.google.protobuf.MapField properties_;
-
+  private com.google.protobuf.MapField<
+      java.lang.String, com.google.datastore.v1.Value> properties_;
   private com.google.protobuf.MapField
-      internalGetProperties() {
+  internalGetProperties() {
     if (properties_ == null) {
-      return com.google.protobuf.MapField.emptyMapField(PropertiesDefaultEntryHolder.defaultEntry);
+      return com.google.protobuf.MapField.emptyMapField(
+          PropertiesDefaultEntryHolder.defaultEntry);
     }
     return properties_;
   }
@@ -230,8 +215,6 @@ public int getPropertiesCount() {
     return internalGetProperties().getMap().size();
   }
   /**
-   *
-   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -243,20 +226,20 @@ public int getPropertiesCount() {
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-  public boolean containsProperties(java.lang.String key) {
-    if (key == null) {
-      throw new java.lang.NullPointerException();
-    }
+
+  public boolean containsProperties(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
     return internalGetProperties().getMap().containsKey(key);
   }
-  /** Use {@link #getPropertiesMap()} instead. */
+  /**
+   * Use {@link #getPropertiesMap()} instead.
+   */
   @java.lang.Deprecated
   public java.util.Map getProperties() {
     return getPropertiesMap();
   }
   /**
-   *
-   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -268,12 +251,11 @@ public java.util.Map getPropert
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
+
   public java.util.Map getPropertiesMap() {
     return internalGetProperties().getMap();
   }
   /**
-   *
-   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -285,18 +267,16 @@ public java.util.Map getPropert
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
+
   public com.google.datastore.v1.Value getPropertiesOrDefault(
-      java.lang.String key, com.google.datastore.v1.Value defaultValue) {
-    if (key == null) {
-      throw new java.lang.NullPointerException();
-    }
+      java.lang.String key,
+      com.google.datastore.v1.Value defaultValue) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
     java.util.Map map =
         internalGetProperties().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
   /**
-   *
-   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -308,10 +288,10 @@ public com.google.datastore.v1.Value getPropertiesOrDefault(
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-  public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key) {
-    if (key == null) {
-      throw new java.lang.NullPointerException();
-    }
+
+  public com.google.datastore.v1.Value getPropertiesOrThrow(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
     java.util.Map map =
         internalGetProperties().getMap();
     if (!map.containsKey(key)) {
@@ -321,7 +301,6 @@ public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key)
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -333,12 +312,17 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (key_ != null) {
       output.writeMessage(1, getKey());
     }
-    com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
-        output, internalGetProperties(), PropertiesDefaultEntryHolder.defaultEntry, 3);
+    com.google.protobuf.GeneratedMessageV3
+      .serializeStringMapTo(
+        output,
+        internalGetProperties(),
+        PropertiesDefaultEntryHolder.defaultEntry,
+        3);
     unknownFields.writeTo(output);
   }
 
@@ -349,17 +333,18 @@ public int getSerializedSize() {
 
     size = 0;
     if (key_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getKey());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getKey());
     }
-    for (java.util.Map.Entry entry :
-        internalGetProperties().getMap().entrySet()) {
-      com.google.protobuf.MapEntry properties__ =
-          PropertiesDefaultEntryHolder.defaultEntry
-              .newBuilderForType()
-              .setKey(entry.getKey())
-              .setValue(entry.getValue())
-              .build();
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, properties__);
+    for (java.util.Map.Entry entry
+         : internalGetProperties().getMap().entrySet()) {
+      com.google.protobuf.MapEntry
+      properties__ = PropertiesDefaultEntryHolder.defaultEntry.newBuilderForType()
+          .setKey(entry.getKey())
+          .setValue(entry.getValue())
+          .build();
+      size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, properties__);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -369,7 +354,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Entity)) {
       return super.equals(obj);
@@ -378,9 +363,11 @@ public boolean equals(final java.lang.Object obj) {
 
     if (hasKey() != other.hasKey()) return false;
     if (hasKey()) {
-      if (!getKey().equals(other.getKey())) return false;
+      if (!getKey()
+          .equals(other.getKey())) return false;
     }
-    if (!internalGetProperties().equals(other.internalGetProperties())) return false;
+    if (!internalGetProperties().equals(
+        other.internalGetProperties())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -405,103 +392,97 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Entity parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Entity parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Entity parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Entity parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.Entity parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Entity parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Entity parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Entity parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Entity parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Entity parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Entity parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Entity parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Entity parseFrom(com.google.protobuf.CodedInputStream input)
+  public static com.google.datastore.v1.Entity parseFrom(
+      com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Entity parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.Entity prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A Datastore data object.
    * An entity is limited to 1 megabyte when stored. That _roughly_
@@ -511,40 +492,41 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * Protobuf type {@code google.datastore.v1.Entity}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Entity)
       com.google.datastore.v1.EntityOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_Entity_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMapField(int number) {
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
       switch (number) {
         case 3:
           return internalGetProperties();
         default:
-          throw new RuntimeException("Invalid map field number: " + number);
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
       }
     }
-
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(
+        int number) {
       switch (number) {
         case 3:
           return internalGetMutableProperties();
         default:
-          throw new RuntimeException("Invalid map field number: " + number);
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
       }
     }
-
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_Entity_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.google.datastore.v1.Entity.class, com.google.datastore.v1.Entity.Builder.class);
     }
@@ -554,15 +536,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -577,9 +560,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_Entity_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Entity_descriptor;
     }
 
     @java.lang.Override
@@ -615,39 +598,38 @@ public com.google.datastore.v1.Entity buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Entity) {
-        return mergeFrom((com.google.datastore.v1.Entity) other);
+        return mergeFrom((com.google.datastore.v1.Entity)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -659,7 +641,8 @@ public Builder mergeFrom(com.google.datastore.v1.Entity other) {
       if (other.hasKey()) {
         mergeKey(other.getKey());
       }
-      internalGetMutableProperties().mergeFrom(other.internalGetProperties());
+      internalGetMutableProperties().mergeFrom(
+          other.internalGetProperties());
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
@@ -688,18 +671,12 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
     private com.google.datastore.v1.Key key_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
-        keyBuilder_;
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyBuilder_;
     /**
-     *
-     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -709,15 +686,12 @@ public Builder mergeFrom(
      * 

      *
      * .google.datastore.v1.Key key = 1;
-     *
      * @return Whether the key field is set.
      */
     public boolean hasKey() {
       return keyBuilder_ != null || key_ != null;
     }
     /**
-     *
-     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -727,7 +701,6 @@ public boolean hasKey() {
      * 

      *
      * .google.datastore.v1.Key key = 1;
-     *
      * @return The key.
      */
     public com.google.datastore.v1.Key getKey() {
@@ -738,8 +711,6 @@ public com.google.datastore.v1.Key getKey() {
       }
     }
     /**
-     *
-     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -764,8 +735,6 @@ public Builder setKey(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -776,7 +745,8 @@ public Builder setKey(com.google.datastore.v1.Key value) {
      *
      * .google.datastore.v1.Key key = 1;
      */
-    public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKey(
+        com.google.datastore.v1.Key.Builder builderForValue) {
       if (keyBuilder_ == null) {
         key_ = builderForValue.build();
         onChanged();
@@ -787,8 +757,6 @@ public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -802,7 +770,8 @@ public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
     public Builder mergeKey(com.google.datastore.v1.Key value) {
       if (keyBuilder_ == null) {
         if (key_ != null) {
-          key_ = com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial();
+          key_ =
+            com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial();
         } else {
           key_ = value;
         }
@@ -814,8 +783,6 @@ public Builder mergeKey(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -838,8 +805,6 @@ public Builder clearKey() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -851,13 +816,11 @@ public Builder clearKey() {
      * .google.datastore.v1.Key key = 1;
      */
     public com.google.datastore.v1.Key.Builder getKeyBuilder() {
-
+      
       onChanged();
       return getKeyFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -872,12 +835,11 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
       if (keyBuilder_ != null) {
         return keyBuilder_.getMessageOrBuilder();
       } else {
-        return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
+        return key_ == null ?
+            com.google.datastore.v1.Key.getDefaultInstance() : key_;
       }
     }
     /**
-     *
-     *
      * 
      * The entity's key.
      * An entity must have a key, unless otherwise documented (for example,
@@ -889,40 +851,35 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
      * .google.datastore.v1.Key key = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
         getKeyFieldBuilder() {
       if (keyBuilder_ == null) {
-        keyBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Key,
-                com.google.datastore.v1.Key.Builder,
-                com.google.datastore.v1.KeyOrBuilder>(getKey(), getParentForChildren(), isClean());
+        keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+                getKey(),
+                getParentForChildren(),
+                isClean());
         key_ = null;
       }
       return keyBuilder_;
     }
 
+    private com.google.protobuf.MapField<
+        java.lang.String, com.google.datastore.v1.Value> properties_;
     private com.google.protobuf.MapField
-        properties_;
-
-    private com.google.protobuf.MapField
-        internalGetProperties() {
+    internalGetProperties() {
       if (properties_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             PropertiesDefaultEntryHolder.defaultEntry);
       }
       return properties_;
     }
-
     private com.google.protobuf.MapField
-        internalGetMutableProperties() {
-      onChanged();
-      ;
+    internalGetMutableProperties() {
+      onChanged();;
       if (properties_ == null) {
-        properties_ =
-            com.google.protobuf.MapField.newMapField(PropertiesDefaultEntryHolder.defaultEntry);
+        properties_ = com.google.protobuf.MapField.newMapField(
+            PropertiesDefaultEntryHolder.defaultEntry);
       }
       if (!properties_.isMutable()) {
         properties_ = properties_.copy();
@@ -934,8 +891,6 @@ public int getPropertiesCount() {
       return internalGetProperties().getMap().size();
     }
     /**
-     *
-     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -947,20 +902,20 @@ public int getPropertiesCount() {
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
-    public boolean containsProperties(java.lang.String key) {
-      if (key == null) {
-        throw new java.lang.NullPointerException();
-      }
+
+    public boolean containsProperties(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
       return internalGetProperties().getMap().containsKey(key);
     }
-    /** Use {@link #getPropertiesMap()} instead. */
+    /**
+     * Use {@link #getPropertiesMap()} instead.
+     */
     @java.lang.Deprecated
     public java.util.Map getProperties() {
       return getPropertiesMap();
     }
     /**
-     *
-     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -972,12 +927,11 @@ public java.util.Map getPropert
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
+
     public java.util.Map getPropertiesMap() {
       return internalGetProperties().getMap();
     }
     /**
-     *
-     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -989,18 +943,16 @@ public java.util.Map getPropert
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
+
     public com.google.datastore.v1.Value getPropertiesOrDefault(
-        java.lang.String key, com.google.datastore.v1.Value defaultValue) {
-      if (key == null) {
-        throw new java.lang.NullPointerException();
-      }
+        java.lang.String key,
+        com.google.datastore.v1.Value defaultValue) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
       java.util.Map map =
           internalGetProperties().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     *
-     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -1012,10 +964,10 @@ public com.google.datastore.v1.Value getPropertiesOrDefault(
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
-    public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new java.lang.NullPointerException();
-      }
+
+    public com.google.datastore.v1.Value getPropertiesOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
       java.util.Map map =
           internalGetProperties().getMap();
       if (!map.containsKey(key)) {
@@ -1025,12 +977,11 @@ public com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key)
     }
 
     public Builder clearProperties() {
-      internalGetMutableProperties().getMutableMap().clear();
+      internalGetMutableProperties().getMutableMap()
+          .clear();
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -1042,21 +993,23 @@ public Builder clearProperties() {
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
-    public Builder removeProperties(java.lang.String key) {
-      if (key == null) {
-        throw new java.lang.NullPointerException();
-      }
-      internalGetMutableProperties().getMutableMap().remove(key);
+
+    public Builder removeProperties(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableProperties().getMutableMap()
+          .remove(key);
       return this;
     }
-    /** Use alternate mutation accessors instead. */
+    /**
+     * Use alternate mutation accessors instead.
+     */
     @java.lang.Deprecated
-    public java.util.Map getMutableProperties() {
+    public java.util.Map
+    getMutableProperties() {
       return internalGetMutableProperties().getMutableMap();
     }
     /**
-     *
-     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -1068,19 +1021,16 @@ public java.util.Map getMutable
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
-    public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value value) {
-      if (key == null) {
-        throw new java.lang.NullPointerException();
-      }
-      if (value == null) {
-        throw new java.lang.NullPointerException();
-      }
-      internalGetMutableProperties().getMutableMap().put(key, value);
+    public Builder putProperties(
+        java.lang.String key,
+        com.google.datastore.v1.Value value) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      if (value == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableProperties().getMutableMap()
+          .put(key, value);
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity's properties.
      * The map's keys are property names.
@@ -1092,14 +1042,16 @@ public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value
      *
      * map<string, .google.datastore.v1.Value> properties = 3;
      */
+
     public Builder putAllProperties(
         java.util.Map values) {
-      internalGetMutableProperties().getMutableMap().putAll(values);
+      internalGetMutableProperties().getMutableMap()
+          .putAll(values);
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1109,12 +1061,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Entity)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Entity)
   private static final com.google.datastore.v1.Entity DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Entity();
   }
@@ -1123,16 +1075,16 @@ public static com.google.datastore.v1.Entity getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public Entity parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Entity(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public Entity parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Entity(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1147,4 +1099,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Entity getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java
index 745700b13..fe74f816a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java
@@ -18,14 +18,11 @@
 
 package com.google.datastore.v1;
 
-public interface EntityOrBuilder
-    extends
+public interface EntityOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Entity)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -35,13 +32,10 @@ public interface EntityOrBuilder
    * 

    *
    * .google.datastore.v1.Key key = 1;
-   *
    * @return Whether the key field is set.
    */
   boolean hasKey();
   /**
-   *
-   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -51,13 +45,10 @@ public interface EntityOrBuilder
    * 

    *
    * .google.datastore.v1.Key key = 1;
-   *
    * @return The key.
    */
   com.google.datastore.v1.Key getKey();
   /**
-   *
-   *
    * 
    * The entity's key.
    * An entity must have a key, unless otherwise documented (for example,
@@ -71,8 +62,6 @@ public interface EntityOrBuilder
   com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder();
 
   /**
-   *
-   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -86,8 +75,6 @@ public interface EntityOrBuilder
    */
   int getPropertiesCount();
   /**
-   *
-   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -99,13 +86,15 @@ public interface EntityOrBuilder
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-  boolean containsProperties(java.lang.String key);
-  /** Use {@link #getPropertiesMap()} instead. */
+  boolean containsProperties(
+      java.lang.String key);
+  /**
+   * Use {@link #getPropertiesMap()} instead.
+   */
   @java.lang.Deprecated
-  java.util.Map getProperties();
+  java.util.Map
+  getProperties();
   /**
-   *
-   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -117,10 +106,9 @@ public interface EntityOrBuilder
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-  java.util.Map getPropertiesMap();
+  java.util.Map
+  getPropertiesMap();
   /**
-   *
-   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -132,11 +120,11 @@ public interface EntityOrBuilder
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
+
   com.google.datastore.v1.Value getPropertiesOrDefault(
-      java.lang.String key, com.google.datastore.v1.Value defaultValue);
+      java.lang.String key,
+      com.google.datastore.v1.Value defaultValue);
   /**
-   *
-   *
    * 
    * The entity's properties.
    * The map's keys are property names.
@@ -148,5 +136,7 @@ com.google.datastore.v1.Value getPropertiesOrDefault(
    *
    * map<string, .google.datastore.v1.Value> properties = 3;
    */
-  com.google.datastore.v1.Value getPropertiesOrThrow(java.lang.String key);
+
+  com.google.datastore.v1.Value getPropertiesOrThrow(
+      java.lang.String key);
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index 392a6aa24..00e75ed98 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -20,161 +20,144 @@
 
 public final class EntityProto {
   private EntityProto() {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
   }
 
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_PartitionId_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_PartitionId_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_PartitionId_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_Key_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_Key_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Key_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_Key_PathElement_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_Key_PathElement_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_ArrayValue_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_ArrayValue_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_Value_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_Value_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Value_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_Entity_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_Entity_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Entity_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_Entity_PropertiesEntry_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_Entity_PropertiesEntry_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Entity_PropertiesEntry_fieldAccessorTable;
 
-  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
     return descriptor;
   }
-
-  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n google/datastore/v1/entity.proto\022\023goog"
-          + "le.datastore.v1\032\034google/api/annotations."
-          + "proto\032\034google/protobuf/struct.proto\032\037goo"
-          + "gle/protobuf/timestamp.proto\032\030google/typ"
-          + "e/latlng.proto\"7\n\013PartitionId\022\022\n\nproject"
-          + "_id\030\002 \001(\t\022\024\n\014namespace_id\030\004 \001(\t\"\267\001\n\003Key\022"
-          + "6\n\014partition_id\030\001 \001(\0132 .google.datastore"
-          + ".v1.PartitionId\0222\n\004path\030\002 \003(\0132$.google.d"
-          + "atastore.v1.Key.PathElement\032D\n\013PathEleme"
-          + "nt\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003"
-          + " \001(\tH\000B\t\n\007id_type\"8\n\nArrayValue\022*\n\006value"
-          + "s\030\001 \003(\0132\032.google.datastore.v1.Value\"\361\003\n\005"
-          + "Value\0220\n\nnull_value\030\013 \001(\0162\032.google.proto"
-          + "buf.NullValueH\000\022\027\n\rboolean_value\030\001 \001(\010H\000"
-          + "\022\027\n\rinteger_value\030\002 \001(\003H\000\022\026\n\014double_valu"
-          + "e\030\003 \001(\001H\000\0225\n\017timestamp_value\030\n \001(\0132\032.goo"
-          + "gle.protobuf.TimestampH\000\022-\n\tkey_value\030\005 "
-          + "\001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014strin"
-          + "g_value\030\021 \001(\tH\000\022\024\n\nblob_value\030\022 \001(\014H\000\022.\n"
-          + "\017geo_point_value\030\010 \001(\0132\023.google.type.Lat"
-          + "LngH\000\0223\n\014entity_value\030\006 \001(\0132\033.google.dat"
-          + "astore.v1.EntityH\000\0226\n\013array_value\030\t \001(\0132"
-          + "\037.google.datastore.v1.ArrayValueH\000\022\017\n\007me"
-          + "aning\030\016 \001(\005\022\034\n\024exclude_from_indexes\030\023 \001("
-          + "\010B\014\n\nvalue_type\"\277\001\n\006Entity\022%\n\003key\030\001 \001(\0132"
-          + "\030.google.datastore.v1.Key\022?\n\nproperties\030"
-          + "\003 \003(\0132+.google.datastore.v1.Entity.Prope"
-          + "rtiesEntry\032M\n\017PropertiesEntry\022\013\n\003key\030\001 \001"
-          + "(\t\022)\n\005value\030\002 \001(\0132\032.google.datastore.v1."
-          + "Value:\0028\001B\236\001\n\027com.google.datastore.v1B\013E"
-          + "ntityProtoP\001Z
  * The result of fetching an entity from Datastore.
  * 

  *
  * Protobuf type {@code google.datastore.v1.EntityResult}
  */
-public final class EntityResult extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class EntityResult extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.EntityResult)
     EntityResultOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use EntityResult.newBuilder() to construct.
   private EntityResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private EntityResult() {
     cursor_ = com.google.protobuf.ByteString.EMPTY;
   }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new EntityResult();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private EntityResult(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -70,68 +68,62 @@ private EntityResult(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              com.google.datastore.v1.Entity.Builder subBuilder = null;
-              if (entity_ != null) {
-                subBuilder = entity_.toBuilder();
-              }
-              entity_ =
-                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(entity_);
-                entity_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 26:
-            {
-              cursor_ = input.readBytes();
-              break;
+          case 10: {
+            com.google.datastore.v1.Entity.Builder subBuilder = null;
+            if (entity_ != null) {
+              subBuilder = entity_.toBuilder();
             }
-          case 32:
-            {
-              version_ = input.readInt64();
-              break;
+            entity_ = input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(entity_);
+              entity_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+
+            break;
+          }
+          case 26: {
+
+            cursor_ = input.readBytes();
+            break;
+          }
+          case 32: {
+
+            version_ = input.readInt64();
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_EntityResult_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_EntityResult_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.EntityResult.class,
-            com.google.datastore.v1.EntityResult.Builder.class);
+            com.google.datastore.v1.EntityResult.class, com.google.datastore.v1.EntityResult.Builder.class);
   }
 
   /**
-   *
-   *
    * 
    * Specifies what data the 'entity' field contains.
    * A `ResultType` is either implied (for example, in `LookupResponse.missing`
@@ -142,10 +134,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * Protobuf enum {@code google.datastore.v1.EntityResult.ResultType}
    */
-  public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
+  public enum ResultType
+      implements com.google.protobuf.ProtocolMessageEnum {
     /**
-     *
-     *
      * 
      * Unspecified. This value is never used.
      * 

@@ -154,8 +145,6 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
      */
     RESULT_TYPE_UNSPECIFIED(0),
     /**
-     *
-     *
      * 
      * The key and properties.
      * 

@@ -164,8 +153,6 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
      */
     FULL(1),
     /**
-     *
-     *
      * 
      * A projected subset of properties. The entity may have no key.
      * 

@@ -174,8 +161,6 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
      */
     PROJECTION(2),
     /**
-     *
-     *
      * 
      * Only the key.
      * 

@@ -187,8 +172,6 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
     ;
 
     /**
-     *
-     *
      * 
      * Unspecified. This value is never used.
      * 

@@ -197,8 +180,6 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int RESULT_TYPE_UNSPECIFIED_VALUE = 0;
     /**
-     *
-     *
      * 
      * The key and properties.
      * 

@@ -207,8 +188,6 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int FULL_VALUE = 1;
     /**
-     *
-     *
      * 
      * A projected subset of properties. The entity may have no key.
      * 

@@ -217,8 +196,6 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int PROJECTION_VALUE = 2;
     /**
-     *
-     *
      * 
      * Only the key.
      * 

@@ -227,6 +204,7 @@ public enum ResultType implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int KEY_ONLY_VALUE = 3;
 
+
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -251,47 +229,46 @@ public static ResultType valueOf(int value) {
      */
     public static ResultType forNumber(int value) {
       switch (value) {
-        case 0:
-          return RESULT_TYPE_UNSPECIFIED;
-        case 1:
-          return FULL;
-        case 2:
-          return PROJECTION;
-        case 3:
-          return KEY_ONLY;
-        default:
-          return null;
+        case 0: return RESULT_TYPE_UNSPECIFIED;
+        case 1: return FULL;
+        case 2: return PROJECTION;
+        case 3: return KEY_ONLY;
+        default: return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
       return internalValueMap;
     }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ResultType> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public ResultType findValueByNumber(int number) {
+              return ResultType.forNumber(number);
+            }
+          };
 
-    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap() {
-          public ResultType findValueByNumber(int number) {
-            return ResultType.forNumber(number);
-          }
-        };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-
-    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
       return getDescriptor();
     }
-
-    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
       return com.google.datastore.v1.EntityResult.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final ResultType[] VALUES = values();
 
-    public static ResultType valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static ResultType valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -311,36 +288,28 @@ private ResultType(int value) {
   public static final int ENTITY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.Entity entity_;
   /**
-   *
-   *
    * 
    * The resulting entity.
    * 

    *
    * .google.datastore.v1.Entity entity = 1;
-   *
    * @return Whether the entity field is set.
    */
   public boolean hasEntity() {
     return entity_ != null;
   }
   /**
-   *
-   *
    * 
    * The resulting entity.
    * 

    *
    * .google.datastore.v1.Entity entity = 1;
-   *
    * @return The entity.
    */
   public com.google.datastore.v1.Entity getEntity() {
     return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_;
   }
   /**
-   *
-   *
    * 
    * The resulting entity.
    * 

@@ -354,8 +323,6 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
   public static final int VERSION_FIELD_NUMBER = 4;
   private long version_;
   /**
-   *
-   *
    * 
    * The version of the entity, a strictly positive number that monotonically
    * increases with changes to the entity.
@@ -367,7 +334,6 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
    * 

    *
    * int64 version = 4;
-   *
    * @return The version.
    */
   public long getVersion() {
@@ -377,15 +343,12 @@ public long getVersion() {
   public static final int CURSOR_FIELD_NUMBER = 3;
   private com.google.protobuf.ByteString cursor_;
   /**
-   *
-   *
    * 
    * A cursor that points to the position after the result entity.
    * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
    * 

    *
    * bytes cursor = 3;
-   *
    * @return The cursor.
    */
   public com.google.protobuf.ByteString getCursor() {
@@ -393,7 +356,6 @@ public com.google.protobuf.ByteString getCursor() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -405,7 +367,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (entity_ != null) {
       output.writeMessage(1, getEntity());
     }
@@ -425,13 +388,16 @@ public int getSerializedSize() {
 
     size = 0;
     if (entity_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getEntity());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getEntity());
     }
     if (!cursor_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream.computeBytesSize(3, cursor_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(3, cursor_);
     }
     if (version_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream.computeInt64Size(4, version_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(4, version_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -441,7 +407,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.EntityResult)) {
       return super.equals(obj);
@@ -450,10 +416,13 @@ public boolean equals(final java.lang.Object obj) {
 
     if (hasEntity() != other.hasEntity()) return false;
     if (hasEntity()) {
-      if (!getEntity().equals(other.getEntity())) return false;
+      if (!getEntity()
+          .equals(other.getEntity())) return false;
     }
-    if (getVersion() != other.getVersion()) return false;
-    if (!getCursor().equals(other.getCursor())) return false;
+    if (getVersion()
+        != other.getVersion()) return false;
+    if (!getCursor()
+        .equals(other.getCursor())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -470,7 +439,8 @@ public int hashCode() {
       hash = (53 * hash) + getEntity().hashCode();
     }
     hash = (37 * hash) + VERSION_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getVersion());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getVersion());
     hash = (37 * hash) + CURSOR_FIELD_NUMBER;
     hash = (53 * hash) + getCursor().hashCode();
     hash = (29 * hash) + unknownFields.hashCode();
@@ -478,126 +448,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.EntityResult parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.EntityResult parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.EntityResult parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.EntityResult parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.EntityResult parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.EntityResult parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.EntityResult parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.EntityResult parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.EntityResult parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.EntityResult parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.EntityResult parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.EntityResult parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.EntityResult parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.EntityResult parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.EntityResult prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The result of fetching an entity from Datastore.
    * 

    *
    * Protobuf type {@code google.datastore.v1.EntityResult}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.EntityResult)
       com.google.datastore.v1.EntityResultOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_EntityResult_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_EntityResult_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.EntityResult.class,
-              com.google.datastore.v1.EntityResult.Builder.class);
+              com.google.datastore.v1.EntityResult.class, com.google.datastore.v1.EntityResult.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.EntityResult.newBuilder()
@@ -605,15 +567,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -631,9 +594,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_EntityResult_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_EntityResult_descriptor;
     }
 
     @java.lang.Override
@@ -668,39 +631,38 @@ public com.google.datastore.v1.EntityResult buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.EntityResult) {
-        return mergeFrom((com.google.datastore.v1.EntityResult) other);
+        return mergeFrom((com.google.datastore.v1.EntityResult)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -749,33 +711,24 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.Entity entity_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity,
-            com.google.datastore.v1.Entity.Builder,
-            com.google.datastore.v1.EntityOrBuilder>
-        entityBuilder_;
+        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> entityBuilder_;
     /**
-     *
-     *
      * 
      * The resulting entity.
      * 

      *
      * .google.datastore.v1.Entity entity = 1;
-     *
      * @return Whether the entity field is set.
      */
     public boolean hasEntity() {
       return entityBuilder_ != null || entity_ != null;
     }
     /**
-     *
-     *
      * 
      * The resulting entity.
      * 

      *
      * .google.datastore.v1.Entity entity = 1;
-     *
      * @return The entity.
      */
     public com.google.datastore.v1.Entity getEntity() {
@@ -786,8 +739,6 @@ public com.google.datastore.v1.Entity getEntity() {
       }
     }
     /**
-     *
-     *
      * 
      * The resulting entity.
      * 

@@ -808,15 +759,14 @@ public Builder setEntity(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The resulting entity.
      * 

      *
      * .google.datastore.v1.Entity entity = 1;
      */
-    public Builder setEntity(com.google.datastore.v1.Entity.Builder builderForValue) {
+    public Builder setEntity(
+        com.google.datastore.v1.Entity.Builder builderForValue) {
       if (entityBuilder_ == null) {
         entity_ = builderForValue.build();
         onChanged();
@@ -827,8 +777,6 @@ public Builder setEntity(com.google.datastore.v1.Entity.Builder builderForValue)
       return this;
     }
     /**
-     *
-     *
      * 
      * The resulting entity.
      * 

@@ -839,7 +787,7 @@ public Builder mergeEntity(com.google.datastore.v1.Entity value) {
       if (entityBuilder_ == null) {
         if (entity_ != null) {
           entity_ =
-              com.google.datastore.v1.Entity.newBuilder(entity_).mergeFrom(value).buildPartial();
+            com.google.datastore.v1.Entity.newBuilder(entity_).mergeFrom(value).buildPartial();
         } else {
           entity_ = value;
         }
@@ -851,8 +799,6 @@ public Builder mergeEntity(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The resulting entity.
      * 

@@ -871,8 +817,6 @@ public Builder clearEntity() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The resulting entity.
      * 

@@ -880,13 +824,11 @@ public Builder clearEntity() {
      * .google.datastore.v1.Entity entity = 1;
      */
     public com.google.datastore.v1.Entity.Builder getEntityBuilder() {
-
+      
       onChanged();
       return getEntityFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The resulting entity.
      * 

@@ -897,12 +839,11 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
       if (entityBuilder_ != null) {
         return entityBuilder_.getMessageOrBuilder();
       } else {
-        return entity_ == null ? com.google.datastore.v1.Entity.getDefaultInstance() : entity_;
+        return entity_ == null ?
+            com.google.datastore.v1.Entity.getDefaultInstance() : entity_;
       }
     }
     /**
-     *
-     *
      * 
      * The resulting entity.
      * 

@@ -910,26 +851,21 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
      * .google.datastore.v1.Entity entity = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity,
-            com.google.datastore.v1.Entity.Builder,
-            com.google.datastore.v1.EntityOrBuilder>
+        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> 
         getEntityFieldBuilder() {
       if (entityBuilder_ == null) {
-        entityBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Entity,
-                com.google.datastore.v1.Entity.Builder,
-                com.google.datastore.v1.EntityOrBuilder>(
-                getEntity(), getParentForChildren(), isClean());
+        entityBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>(
+                getEntity(),
+                getParentForChildren(),
+                isClean());
         entity_ = null;
       }
       return entityBuilder_;
     }
 
-    private long version_;
+    private long version_ ;
     /**
-     *
-     *
      * 
      * The version of the entity, a strictly positive number that monotonically
      * increases with changes to the entity.
@@ -941,15 +877,12 @@ public com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder() {
      * 

      *
      * int64 version = 4;
-     *
      * @return The version.
      */
     public long getVersion() {
       return version_;
     }
     /**
-     *
-     *
      * 
      * The version of the entity, a strictly positive number that monotonically
      * increases with changes to the entity.
@@ -961,19 +894,16 @@ public long getVersion() {
      * 

      *
      * int64 version = 4;
-     *
      * @param value The version to set.
      * @return This builder for chaining.
      */
     public Builder setVersion(long value) {
-
+      
       version_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The version of the entity, a strictly positive number that monotonically
      * increases with changes to the entity.
@@ -985,11 +915,10 @@ public Builder setVersion(long value) {
      * 

      *
      * int64 version = 4;
-     *
      * @return This builder for chaining.
      */
     public Builder clearVersion() {
-
+      
       version_ = 0L;
       onChanged();
       return this;
@@ -997,63 +926,54 @@ public Builder clearVersion() {
 
     private com.google.protobuf.ByteString cursor_ = com.google.protobuf.ByteString.EMPTY;
     /**
-     *
-     *
      * 
      * A cursor that points to the position after the result entity.
      * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
      * 

      *
      * bytes cursor = 3;
-     *
      * @return The cursor.
      */
     public com.google.protobuf.ByteString getCursor() {
       return cursor_;
     }
     /**
-     *
-     *
      * 
      * A cursor that points to the position after the result entity.
      * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
      * 

      *
      * bytes cursor = 3;
-     *
      * @param value The cursor to set.
      * @return This builder for chaining.
      */
     public Builder setCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       cursor_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * A cursor that points to the position after the result entity.
      * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
      * 

      *
      * bytes cursor = 3;
-     *
      * @return This builder for chaining.
      */
     public Builder clearCursor() {
-
+      
       cursor_ = getDefaultInstance().getCursor();
       onChanged();
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1063,12 +983,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.EntityResult)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.EntityResult)
   private static final com.google.datastore.v1.EntityResult DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.EntityResult();
   }
@@ -1077,16 +997,16 @@ public static com.google.datastore.v1.EntityResult getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public EntityResult parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new EntityResult(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public EntityResult parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new EntityResult(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1101,4 +1021,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.EntityResult getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java
index 4274984ce..e770eec4b 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResultOrBuilder.java
@@ -18,38 +18,29 @@
 
 package com.google.datastore.v1;
 
-public interface EntityResultOrBuilder
-    extends
+public interface EntityResultOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.EntityResult)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The resulting entity.
    * 

    *
    * .google.datastore.v1.Entity entity = 1;
-   *
    * @return Whether the entity field is set.
    */
   boolean hasEntity();
   /**
-   *
-   *
    * 
    * The resulting entity.
    * 

    *
    * .google.datastore.v1.Entity entity = 1;
-   *
    * @return The entity.
    */
   com.google.datastore.v1.Entity getEntity();
   /**
-   *
-   *
    * 
    * The resulting entity.
    * 

@@ -59,8 +50,6 @@ public interface EntityResultOrBuilder
   com.google.datastore.v1.EntityOrBuilder getEntityOrBuilder();
 
   /**
-   *
-   *
    * 
    * The version of the entity, a strictly positive number that monotonically
    * increases with changes to the entity.
@@ -72,21 +61,17 @@ public interface EntityResultOrBuilder
    * 

    *
    * int64 version = 4;
-   *
    * @return The version.
    */
   long getVersion();
 
   /**
-   *
-   *
    * 
    * A cursor that points to the position after the result entity.
    * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
    * 

    *
    * bytes cursor = 3;
-   *
    * @return The cursor.
    */
   com.google.protobuf.ByteString getCursor();
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java
index 4fbff2da5..655b643cb 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java
@@ -19,37 +19,36 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A holder for any type of filter.
  * 

  *
  * Protobuf type {@code google.datastore.v1.Filter}
  */
-public final class Filter extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class Filter extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Filter)
     FilterOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use Filter.newBuilder() to construct.
   private Filter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private Filter() {}
+  private Filter() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new Filter();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private Filter(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -68,82 +67,75 @@ private Filter(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              com.google.datastore.v1.CompositeFilter.Builder subBuilder = null;
-              if (filterTypeCase_ == 1) {
-                subBuilder = ((com.google.datastore.v1.CompositeFilter) filterType_).toBuilder();
-              }
-              filterType_ =
-                  input.readMessage(
-                      com.google.datastore.v1.CompositeFilter.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.CompositeFilter) filterType_);
-                filterType_ = subBuilder.buildPartial();
-              }
-              filterTypeCase_ = 1;
-              break;
+          case 10: {
+            com.google.datastore.v1.CompositeFilter.Builder subBuilder = null;
+            if (filterTypeCase_ == 1) {
+              subBuilder = ((com.google.datastore.v1.CompositeFilter) filterType_).toBuilder();
             }
-          case 18:
-            {
-              com.google.datastore.v1.PropertyFilter.Builder subBuilder = null;
-              if (filterTypeCase_ == 2) {
-                subBuilder = ((com.google.datastore.v1.PropertyFilter) filterType_).toBuilder();
-              }
-              filterType_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyFilter.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.PropertyFilter) filterType_);
-                filterType_ = subBuilder.buildPartial();
-              }
-              filterTypeCase_ = 2;
-              break;
+            filterType_ =
+                input.readMessage(com.google.datastore.v1.CompositeFilter.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.CompositeFilter) filterType_);
+              filterType_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            filterTypeCase_ = 1;
+            break;
+          }
+          case 18: {
+            com.google.datastore.v1.PropertyFilter.Builder subBuilder = null;
+            if (filterTypeCase_ == 2) {
+              subBuilder = ((com.google.datastore.v1.PropertyFilter) filterType_).toBuilder();
             }
+            filterType_ =
+                input.readMessage(com.google.datastore.v1.PropertyFilter.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.PropertyFilter) filterType_);
+              filterType_ = subBuilder.buildPartial();
+            }
+            filterTypeCase_ = 2;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_Filter_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.Filter.class, com.google.datastore.v1.Filter.Builder.class);
   }
 
   private int filterTypeCase_ = 0;
   private java.lang.Object filterType_;
-
   public enum FilterTypeCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
+      implements com.google.protobuf.Internal.EnumLite,
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     COMPOSITE_FILTER(1),
     PROPERTY_FILTER(2),
     FILTERTYPE_NOT_SET(0);
     private final int value;
-
     private FilterTypeCase(int value) {
       this.value = value;
     }
@@ -159,61 +151,50 @@ public static FilterTypeCase valueOf(int value) {
 
     public static FilterTypeCase forNumber(int value) {
       switch (value) {
-        case 1:
-          return COMPOSITE_FILTER;
-        case 2:
-          return PROPERTY_FILTER;
-        case 0:
-          return FILTERTYPE_NOT_SET;
-        default:
-          return null;
+        case 1: return COMPOSITE_FILTER;
+        case 2: return PROPERTY_FILTER;
+        case 0: return FILTERTYPE_NOT_SET;
+        default: return null;
       }
     }
-
     public int getNumber() {
       return this.value;
     }
   };
 
-  public FilterTypeCase getFilterTypeCase() {
-    return FilterTypeCase.forNumber(filterTypeCase_);
+  public FilterTypeCase
+  getFilterTypeCase() {
+    return FilterTypeCase.forNumber(
+        filterTypeCase_);
   }
 
   public static final int COMPOSITE_FILTER_FIELD_NUMBER = 1;
   /**
-   *
-   *
    * 
    * A composite filter.
    * 

    *
    * .google.datastore.v1.CompositeFilter composite_filter = 1;
-   *
    * @return Whether the compositeFilter field is set.
    */
   public boolean hasCompositeFilter() {
     return filterTypeCase_ == 1;
   }
   /**
-   *
-   *
    * 
    * A composite filter.
    * 

    *
    * .google.datastore.v1.CompositeFilter composite_filter = 1;
-   *
    * @return The compositeFilter.
    */
   public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
     if (filterTypeCase_ == 1) {
-      return (com.google.datastore.v1.CompositeFilter) filterType_;
+       return (com.google.datastore.v1.CompositeFilter) filterType_;
     }
     return com.google.datastore.v1.CompositeFilter.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * A composite filter.
    * 

@@ -222,46 +203,38 @@ public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
    */
   public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuilder() {
     if (filterTypeCase_ == 1) {
-      return (com.google.datastore.v1.CompositeFilter) filterType_;
+       return (com.google.datastore.v1.CompositeFilter) filterType_;
     }
     return com.google.datastore.v1.CompositeFilter.getDefaultInstance();
   }
 
   public static final int PROPERTY_FILTER_FIELD_NUMBER = 2;
   /**
-   *
-   *
    * 
    * A filter on a property.
    * 

    *
    * .google.datastore.v1.PropertyFilter property_filter = 2;
-   *
    * @return Whether the propertyFilter field is set.
    */
   public boolean hasPropertyFilter() {
     return filterTypeCase_ == 2;
   }
   /**
-   *
-   *
    * 
    * A filter on a property.
    * 

    *
    * .google.datastore.v1.PropertyFilter property_filter = 2;
-   *
    * @return The propertyFilter.
    */
   public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
     if (filterTypeCase_ == 2) {
-      return (com.google.datastore.v1.PropertyFilter) filterType_;
+       return (com.google.datastore.v1.PropertyFilter) filterType_;
     }
     return com.google.datastore.v1.PropertyFilter.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * A filter on a property.
    * 

@@ -270,13 +243,12 @@ public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
    */
   public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilder() {
     if (filterTypeCase_ == 2) {
-      return (com.google.datastore.v1.PropertyFilter) filterType_;
+       return (com.google.datastore.v1.PropertyFilter) filterType_;
     }
     return com.google.datastore.v1.PropertyFilter.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -288,7 +260,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (filterTypeCase_ == 1) {
       output.writeMessage(1, (com.google.datastore.v1.CompositeFilter) filterType_);
     }
@@ -305,14 +278,12 @@ public int getSerializedSize() {
 
     size = 0;
     if (filterTypeCase_ == 1) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              1, (com.google.datastore.v1.CompositeFilter) filterType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, (com.google.datastore.v1.CompositeFilter) filterType_);
     }
     if (filterTypeCase_ == 2) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              2, (com.google.datastore.v1.PropertyFilter) filterType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, (com.google.datastore.v1.PropertyFilter) filterType_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -322,7 +293,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Filter)) {
       return super.equals(obj);
@@ -332,10 +303,12 @@ public boolean equals(final java.lang.Object obj) {
     if (!getFilterTypeCase().equals(other.getFilterTypeCase())) return false;
     switch (filterTypeCase_) {
       case 1:
-        if (!getCompositeFilter().equals(other.getCompositeFilter())) return false;
+        if (!getCompositeFilter()
+            .equals(other.getCompositeFilter())) return false;
         break;
       case 2:
-        if (!getPropertyFilter().equals(other.getPropertyFilter())) return false;
+        if (!getPropertyFilter()
+            .equals(other.getPropertyFilter())) return false;
         break;
       case 0:
       default:
@@ -368,123 +341,116 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Filter parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Filter parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Filter parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Filter parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.Filter parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Filter parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Filter parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Filter parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Filter parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Filter parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Filter parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Filter parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Filter parseFrom(com.google.protobuf.CodedInputStream input)
+  public static com.google.datastore.v1.Filter parseFrom(
+      com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Filter parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.Filter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A holder for any type of filter.
    * 

    *
    * Protobuf type {@code google.datastore.v1.Filter}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Filter)
       com.google.datastore.v1.FilterOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_Filter_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_Filter_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.google.datastore.v1.Filter.class, com.google.datastore.v1.Filter.Builder.class);
     }
@@ -494,15 +460,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -512,9 +479,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_Filter_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor;
     }
 
     @java.lang.Override
@@ -557,39 +524,38 @@ public com.google.datastore.v1.Filter buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Filter) {
-        return mergeFrom((com.google.datastore.v1.Filter) other);
+        return mergeFrom((com.google.datastore.v1.Filter)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -599,20 +565,17 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.datastore.v1.Filter other) {
       if (other == com.google.datastore.v1.Filter.getDefaultInstance()) return this;
       switch (other.getFilterTypeCase()) {
-        case COMPOSITE_FILTER:
-          {
-            mergeCompositeFilter(other.getCompositeFilter());
-            break;
-          }
-        case PROPERTY_FILTER:
-          {
-            mergePropertyFilter(other.getPropertyFilter());
-            break;
-          }
-        case FILTERTYPE_NOT_SET:
-          {
-            break;
-          }
+        case COMPOSITE_FILTER: {
+          mergeCompositeFilter(other.getCompositeFilter());
+          break;
+        }
+        case PROPERTY_FILTER: {
+          mergePropertyFilter(other.getPropertyFilter());
+          break;
+        }
+        case FILTERTYPE_NOT_SET: {
+          break;
+        }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -642,12 +605,12 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int filterTypeCase_ = 0;
     private java.lang.Object filterType_;
-
-    public FilterTypeCase getFilterTypeCase() {
-      return FilterTypeCase.forNumber(filterTypeCase_);
+    public FilterTypeCase
+        getFilterTypeCase() {
+      return FilterTypeCase.forNumber(
+          filterTypeCase_);
     }
 
     public Builder clearFilterType() {
@@ -657,34 +620,26 @@ public Builder clearFilterType() {
       return this;
     }
 
+
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.CompositeFilter,
-            com.google.datastore.v1.CompositeFilter.Builder,
-            com.google.datastore.v1.CompositeFilterOrBuilder>
-        compositeFilterBuilder_;
+        com.google.datastore.v1.CompositeFilter, com.google.datastore.v1.CompositeFilter.Builder, com.google.datastore.v1.CompositeFilterOrBuilder> compositeFilterBuilder_;
     /**
-     *
-     *
      * 
      * A composite filter.
      * 

      *
      * .google.datastore.v1.CompositeFilter composite_filter = 1;
-     *
      * @return Whether the compositeFilter field is set.
      */
     public boolean hasCompositeFilter() {
       return filterTypeCase_ == 1;
     }
     /**
-     *
-     *
      * 
      * A composite filter.
      * 

      *
      * .google.datastore.v1.CompositeFilter composite_filter = 1;
-     *
      * @return The compositeFilter.
      */
     public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
@@ -701,8 +656,6 @@ public com.google.datastore.v1.CompositeFilter getCompositeFilter() {
       }
     }
     /**
-     *
-     *
      * 
      * A composite filter.
      * 

@@ -723,8 +676,6 @@ public Builder setCompositeFilter(com.google.datastore.v1.CompositeFilter value)
       return this;
     }
     /**
-     *
-     *
      * 
      * A composite filter.
      * 

@@ -743,8 +694,6 @@ public Builder setCompositeFilter(
       return this;
     }
     /**
-     *
-     *
      * 
      * A composite filter.
      * 

@@ -753,13 +702,10 @@ public Builder setCompositeFilter(
      */
     public Builder mergeCompositeFilter(com.google.datastore.v1.CompositeFilter value) {
       if (compositeFilterBuilder_ == null) {
-        if (filterTypeCase_ == 1
-            && filterType_ != com.google.datastore.v1.CompositeFilter.getDefaultInstance()) {
-          filterType_ =
-              com.google.datastore.v1.CompositeFilter.newBuilder(
-                      (com.google.datastore.v1.CompositeFilter) filterType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (filterTypeCase_ == 1 &&
+            filterType_ != com.google.datastore.v1.CompositeFilter.getDefaultInstance()) {
+          filterType_ = com.google.datastore.v1.CompositeFilter.newBuilder((com.google.datastore.v1.CompositeFilter) filterType_)
+              .mergeFrom(value).buildPartial();
         } else {
           filterType_ = value;
         }
@@ -774,8 +720,6 @@ public Builder mergeCompositeFilter(com.google.datastore.v1.CompositeFilter valu
       return this;
     }
     /**
-     *
-     *
      * 
      * A composite filter.
      * 

@@ -799,8 +743,6 @@ public Builder clearCompositeFilter() {
       return this;
     }
     /**
-     *
-     *
      * 
      * A composite filter.
      * 

@@ -811,8 +753,6 @@ public com.google.datastore.v1.CompositeFilter.Builder getCompositeFilterBuilder
       return getCompositeFilterFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * A composite filter.
      * 

@@ -830,8 +770,6 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
       }
     }
     /**
-     *
-     *
      * 
      * A composite filter.
      * 

@@ -839,58 +777,43 @@ public com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuil
      * .google.datastore.v1.CompositeFilter composite_filter = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.CompositeFilter,
-            com.google.datastore.v1.CompositeFilter.Builder,
-            com.google.datastore.v1.CompositeFilterOrBuilder>
+        com.google.datastore.v1.CompositeFilter, com.google.datastore.v1.CompositeFilter.Builder, com.google.datastore.v1.CompositeFilterOrBuilder> 
         getCompositeFilterFieldBuilder() {
       if (compositeFilterBuilder_ == null) {
         if (!(filterTypeCase_ == 1)) {
           filterType_ = com.google.datastore.v1.CompositeFilter.getDefaultInstance();
         }
-        compositeFilterBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.CompositeFilter,
-                com.google.datastore.v1.CompositeFilter.Builder,
-                com.google.datastore.v1.CompositeFilterOrBuilder>(
+        compositeFilterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.CompositeFilter, com.google.datastore.v1.CompositeFilter.Builder, com.google.datastore.v1.CompositeFilterOrBuilder>(
                 (com.google.datastore.v1.CompositeFilter) filterType_,
                 getParentForChildren(),
                 isClean());
         filterType_ = null;
       }
       filterTypeCase_ = 1;
-      onChanged();
-      ;
+      onChanged();;
       return compositeFilterBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyFilter,
-            com.google.datastore.v1.PropertyFilter.Builder,
-            com.google.datastore.v1.PropertyFilterOrBuilder>
-        propertyFilterBuilder_;
+        com.google.datastore.v1.PropertyFilter, com.google.datastore.v1.PropertyFilter.Builder, com.google.datastore.v1.PropertyFilterOrBuilder> propertyFilterBuilder_;
     /**
-     *
-     *
      * 
      * A filter on a property.
      * 

      *
      * .google.datastore.v1.PropertyFilter property_filter = 2;
-     *
      * @return Whether the propertyFilter field is set.
      */
     public boolean hasPropertyFilter() {
       return filterTypeCase_ == 2;
     }
     /**
-     *
-     *
      * 
      * A filter on a property.
      * 

      *
      * .google.datastore.v1.PropertyFilter property_filter = 2;
-     *
      * @return The propertyFilter.
      */
     public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
@@ -907,8 +830,6 @@ public com.google.datastore.v1.PropertyFilter getPropertyFilter() {
       }
     }
     /**
-     *
-     *
      * 
      * A filter on a property.
      * 

@@ -929,8 +850,6 @@ public Builder setPropertyFilter(com.google.datastore.v1.PropertyFilter value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A filter on a property.
      * 

@@ -949,8 +868,6 @@ public Builder setPropertyFilter(
       return this;
     }
     /**
-     *
-     *
      * 
      * A filter on a property.
      * 

@@ -959,13 +876,10 @@ public Builder setPropertyFilter(
      */
     public Builder mergePropertyFilter(com.google.datastore.v1.PropertyFilter value) {
       if (propertyFilterBuilder_ == null) {
-        if (filterTypeCase_ == 2
-            && filterType_ != com.google.datastore.v1.PropertyFilter.getDefaultInstance()) {
-          filterType_ =
-              com.google.datastore.v1.PropertyFilter.newBuilder(
-                      (com.google.datastore.v1.PropertyFilter) filterType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (filterTypeCase_ == 2 &&
+            filterType_ != com.google.datastore.v1.PropertyFilter.getDefaultInstance()) {
+          filterType_ = com.google.datastore.v1.PropertyFilter.newBuilder((com.google.datastore.v1.PropertyFilter) filterType_)
+              .mergeFrom(value).buildPartial();
         } else {
           filterType_ = value;
         }
@@ -980,8 +894,6 @@ public Builder mergePropertyFilter(com.google.datastore.v1.PropertyFilter value)
       return this;
     }
     /**
-     *
-     *
      * 
      * A filter on a property.
      * 

@@ -1005,8 +917,6 @@ public Builder clearPropertyFilter() {
       return this;
     }
     /**
-     *
-     *
      * 
      * A filter on a property.
      * 

@@ -1017,8 +927,6 @@ public com.google.datastore.v1.PropertyFilter.Builder getPropertyFilterBuilder()
       return getPropertyFilterFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * A filter on a property.
      * 

@@ -1036,8 +944,6 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde
       }
     }
     /**
-     *
-     *
      * 
      * A filter on a property.
      * 

@@ -1045,32 +951,26 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde
      * .google.datastore.v1.PropertyFilter property_filter = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyFilter,
-            com.google.datastore.v1.PropertyFilter.Builder,
-            com.google.datastore.v1.PropertyFilterOrBuilder>
+        com.google.datastore.v1.PropertyFilter, com.google.datastore.v1.PropertyFilter.Builder, com.google.datastore.v1.PropertyFilterOrBuilder> 
         getPropertyFilterFieldBuilder() {
       if (propertyFilterBuilder_ == null) {
         if (!(filterTypeCase_ == 2)) {
           filterType_ = com.google.datastore.v1.PropertyFilter.getDefaultInstance();
         }
-        propertyFilterBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.PropertyFilter,
-                com.google.datastore.v1.PropertyFilter.Builder,
-                com.google.datastore.v1.PropertyFilterOrBuilder>(
+        propertyFilterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyFilter, com.google.datastore.v1.PropertyFilter.Builder, com.google.datastore.v1.PropertyFilterOrBuilder>(
                 (com.google.datastore.v1.PropertyFilter) filterType_,
                 getParentForChildren(),
                 isClean());
         filterType_ = null;
       }
       filterTypeCase_ = 2;
-      onChanged();
-      ;
+      onChanged();;
       return propertyFilterBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1080,12 +980,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Filter)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Filter)
   private static final com.google.datastore.v1.Filter DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Filter();
   }
@@ -1094,16 +994,16 @@ public static com.google.datastore.v1.Filter getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public Filter parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Filter(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public Filter parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Filter(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1118,4 +1018,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Filter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java
index 1ad0f8086..250f2e8eb 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/FilterOrBuilder.java
@@ -18,38 +18,29 @@
 
 package com.google.datastore.v1;
 
-public interface FilterOrBuilder
-    extends
+public interface FilterOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Filter)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * A composite filter.
    * 

    *
    * .google.datastore.v1.CompositeFilter composite_filter = 1;
-   *
    * @return Whether the compositeFilter field is set.
    */
   boolean hasCompositeFilter();
   /**
-   *
-   *
    * 
    * A composite filter.
    * 

    *
    * .google.datastore.v1.CompositeFilter composite_filter = 1;
-   *
    * @return The compositeFilter.
    */
   com.google.datastore.v1.CompositeFilter getCompositeFilter();
   /**
-   *
-   *
    * 
    * A composite filter.
    * 

@@ -59,32 +50,24 @@ public interface FilterOrBuilder
   com.google.datastore.v1.CompositeFilterOrBuilder getCompositeFilterOrBuilder();
 
   /**
-   *
-   *
    * 
    * A filter on a property.
    * 

    *
    * .google.datastore.v1.PropertyFilter property_filter = 2;
-   *
    * @return Whether the propertyFilter field is set.
    */
   boolean hasPropertyFilter();
   /**
-   *
-   *
    * 
    * A filter on a property.
    * 

    *
    * .google.datastore.v1.PropertyFilter property_filter = 2;
-   *
    * @return The propertyFilter.
    */
   com.google.datastore.v1.PropertyFilter getPropertyFilter();
   /**
-   *
-   *
    * 
    * A filter on a property.
    * 

diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java
index 758f99972..17d38fa5c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java
@@ -19,8 +19,6 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A [GQL
  * query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
@@ -28,16 +26,15 @@
  *
  * Protobuf type {@code google.datastore.v1.GqlQuery}
  */
-public final class GqlQuery extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class GqlQuery extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.GqlQuery)
     GqlQueryOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use GqlQuery.newBuilder() to construct.
   private GqlQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private GqlQuery() {
     queryString_ = "";
     positionalBindings_ = java.util.Collections.emptyList();
@@ -45,15 +42,16 @@ private GqlQuery() {
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new GqlQuery();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private GqlQuery(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -73,62 +71,53 @@ private GqlQuery(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              queryString_ = s;
-              break;
-            }
-          case 16:
-            {
-              allowLiterals_ = input.readBool();
-              break;
-            }
-          case 34:
-            {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                positionalBindings_ =
-                    new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              positionalBindings_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.GqlQueryParameter.parser(), extensionRegistry));
-              break;
+            queryString_ = s;
+            break;
+          }
+          case 16: {
+
+            allowLiterals_ = input.readBool();
+            break;
+          }
+          case 34: {
+            if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              positionalBindings_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000002;
             }
-          case 42:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                namedBindings_ =
-                    com.google.protobuf.MapField.newMapField(
-                        NamedBindingsDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
-              }
-              com.google.protobuf.MapEntry<
-                      java.lang.String, com.google.datastore.v1.GqlQueryParameter>
-                  namedBindings__ =
-                      input.readMessage(
-                          NamedBindingsDefaultEntryHolder.defaultEntry.getParserForType(),
-                          extensionRegistry);
-              namedBindings_
-                  .getMutableMap()
-                  .put(namedBindings__.getKey(), namedBindings__.getValue());
-              break;
+            positionalBindings_.add(
+                input.readMessage(com.google.datastore.v1.GqlQueryParameter.parser(), extensionRegistry));
+            break;
+          }
+          case 42: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              namedBindings_ = com.google.protobuf.MapField.newMapField(
+                  NamedBindingsDefaultEntryHolder.defaultEntry);
+              mutable_bitField0_ |= 0x00000001;
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            com.google.protobuf.MapEntry
+            namedBindings__ = input.readMessage(
+                NamedBindingsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+            namedBindings_.getMutableMap().put(
+                namedBindings__.getKey(), namedBindings__.getValue());
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000002) != 0)) {
         positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_);
@@ -137,28 +126,27 @@ private GqlQuery(
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_GqlQuery_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor;
   }
 
   @SuppressWarnings({"rawtypes"})
   @java.lang.Override
-  protected com.google.protobuf.MapField internalGetMapField(int number) {
+  protected com.google.protobuf.MapField internalGetMapField(
+      int number) {
     switch (number) {
       case 5:
         return internalGetNamedBindings();
       default:
-        throw new RuntimeException("Invalid map field number: " + number);
+        throw new RuntimeException(
+            "Invalid map field number: " + number);
     }
   }
-
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.GqlQuery.class, com.google.datastore.v1.GqlQuery.Builder.class);
   }
@@ -166,15 +154,12 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
   public static final int QUERY_STRING_FIELD_NUMBER = 1;
   private volatile java.lang.Object queryString_;
   /**
-   *
-   *
    * 
    * A string of the format described
    * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
    * 

    *
    * string query_string = 1;
-   *
    * @return The queryString.
    */
   public java.lang.String getQueryString() {
@@ -182,29 +167,29 @@ public java.lang.String getQueryString() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       queryString_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * A string of the format described
    * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
    * 

    *
    * string query_string = 1;
-   *
    * @return The bytes for queryString.
    */
-  public com.google.protobuf.ByteString getQueryStringBytes() {
+  public com.google.protobuf.ByteString
+      getQueryStringBytes() {
     java.lang.Object ref = queryString_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       queryString_ = b;
       return b;
     } else {
@@ -215,8 +200,6 @@ public com.google.protobuf.ByteString getQueryStringBytes() {
   public static final int ALLOW_LITERALS_FIELD_NUMBER = 2;
   private boolean allowLiterals_;
   /**
-   *
-   *
    * 
    * When false, the query string must not contain any literals and instead must
    * bind all values. For example,
@@ -225,7 +208,6 @@ public com.google.protobuf.ByteString getQueryStringBytes() {
    * 

    *
    * bool allow_literals = 2;
-   *
    * @return The allowLiterals.
    */
   public boolean getAllowLiterals() {
@@ -233,26 +215,21 @@ public boolean getAllowLiterals() {
   }
 
   public static final int NAMED_BINDINGS_FIELD_NUMBER = 5;
-
   private static final class NamedBindingsDefaultEntryHolder {
     static final com.google.protobuf.MapEntry<
-            java.lang.String, com.google.datastore.v1.GqlQueryParameter>
-        defaultEntry =
+        java.lang.String, com.google.datastore.v1.GqlQueryParameter> defaultEntry =
             com.google.protobuf.MapEntry
-                .newDefaultInstance(
-                    com.google.datastore.v1.QueryProto
-                        .internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_descriptor,
-                    com.google.protobuf.WireFormat.FieldType.STRING,
-                    "",
-                    com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                    com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
+            .newDefaultInstance(
+                com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_descriptor, 
+                com.google.protobuf.WireFormat.FieldType.STRING,
+                "",
+                com.google.protobuf.WireFormat.FieldType.MESSAGE,
+                com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
   }
-
-  private com.google.protobuf.MapField
-      namedBindings_;
-
+  private com.google.protobuf.MapField<
+      java.lang.String, com.google.datastore.v1.GqlQueryParameter> namedBindings_;
   private com.google.protobuf.MapField
-      internalGetNamedBindings() {
+  internalGetNamedBindings() {
     if (namedBindings_ == null) {
       return com.google.protobuf.MapField.emptyMapField(
           NamedBindingsDefaultEntryHolder.defaultEntry);
@@ -264,8 +241,6 @@ public int getNamedBindingsCount() {
     return internalGetNamedBindings().getMap().size();
   }
   /**
-   *
-   *
    * 
    * For each non-reserved named binding site in the query string, there must be
    * a named parameter with that name, but not necessarily the inverse.
@@ -275,21 +250,20 @@ public int getNamedBindingsCount() {
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-  public boolean containsNamedBindings(java.lang.String key) {
-    if (key == null) {
-      throw new java.lang.NullPointerException();
-    }
+
+  public boolean containsNamedBindings(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
     return internalGetNamedBindings().getMap().containsKey(key);
   }
-  /** Use {@link #getNamedBindingsMap()} instead. */
+  /**
+   * Use {@link #getNamedBindingsMap()} instead.
+   */
   @java.lang.Deprecated
-  public java.util.Map
-      getNamedBindings() {
+  public java.util.Map getNamedBindings() {
     return getNamedBindingsMap();
   }
   /**
-   *
-   *
    * 
    * For each non-reserved named binding site in the query string, there must be
    * a named parameter with that name, but not necessarily the inverse.
@@ -299,13 +273,11 @@ public boolean containsNamedBindings(java.lang.String key) {
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-  public java.util.Map
-      getNamedBindingsMap() {
+
+  public java.util.Map getNamedBindingsMap() {
     return internalGetNamedBindings().getMap();
   }
   /**
-   *
-   *
    * 
    * For each non-reserved named binding site in the query string, there must be
    * a named parameter with that name, but not necessarily the inverse.
@@ -315,18 +287,16 @@ public boolean containsNamedBindings(java.lang.String key) {
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
+
   public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
-      java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue) {
-    if (key == null) {
-      throw new java.lang.NullPointerException();
-    }
+      java.lang.String key,
+      com.google.datastore.v1.GqlQueryParameter defaultValue) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
     java.util.Map map =
         internalGetNamedBindings().getMap();
     return map.containsKey(key) ? map.get(key) : defaultValue;
   }
   /**
-   *
-   *
    * 
    * For each non-reserved named binding site in the query string, there must be
    * a named parameter with that name, but not necessarily the inverse.
@@ -336,10 +306,10 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-  public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.lang.String key) {
-    if (key == null) {
-      throw new java.lang.NullPointerException();
-    }
+
+  public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
+      java.lang.String key) {
+    if (key == null) { throw new java.lang.NullPointerException(); }
     java.util.Map map =
         internalGetNamedBindings().getMap();
     if (!map.containsKey(key)) {
@@ -351,8 +321,6 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.la
   public static final int POSITIONAL_BINDINGS_FIELD_NUMBER = 4;
   private java.util.List positionalBindings_;
   /**
-   *
-   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -366,8 +334,6 @@ public java.util.List getPositionalBi
     return positionalBindings_;
   }
   /**
-   *
-   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -377,13 +343,11 @@ public java.util.List getPositionalBi
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
-  public java.util.List
+  public java.util.List 
       getPositionalBindingsOrBuilderList() {
     return positionalBindings_;
   }
   /**
-   *
-   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -397,8 +361,6 @@ public int getPositionalBindingsCount() {
     return positionalBindings_.size();
   }
   /**
-   *
-   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -412,8 +374,6 @@ public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index
     return positionalBindings_.get(index);
   }
   /**
-   *
-   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -429,7 +389,6 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -441,7 +400,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (!getQueryStringBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, queryString_);
     }
@@ -451,8 +411,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < positionalBindings_.size(); i++) {
       output.writeMessage(4, positionalBindings_.get(i));
     }
-    com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
-        output, internalGetNamedBindings(), NamedBindingsDefaultEntryHolder.defaultEntry, 5);
+    com.google.protobuf.GeneratedMessageV3
+      .serializeStringMapTo(
+        output,
+        internalGetNamedBindings(),
+        NamedBindingsDefaultEntryHolder.defaultEntry,
+        5);
     unknownFields.writeTo(output);
   }
 
@@ -466,22 +430,22 @@ public int getSerializedSize() {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, queryString_);
     }
     if (allowLiterals_ != false) {
-      size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, allowLiterals_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(2, allowLiterals_);
     }
     for (int i = 0; i < positionalBindings_.size(); i++) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(4, positionalBindings_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(4, positionalBindings_.get(i));
     }
-    for (java.util.Map.Entry entry :
-        internalGetNamedBindings().getMap().entrySet()) {
+    for (java.util.Map.Entry entry
+         : internalGetNamedBindings().getMap().entrySet()) {
       com.google.protobuf.MapEntry
-          namedBindings__ =
-              NamedBindingsDefaultEntryHolder.defaultEntry
-                  .newBuilderForType()
-                  .setKey(entry.getKey())
-                  .setValue(entry.getValue())
-                  .build();
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, namedBindings__);
+      namedBindings__ = NamedBindingsDefaultEntryHolder.defaultEntry.newBuilderForType()
+          .setKey(entry.getKey())
+          .setValue(entry.getValue())
+          .build();
+      size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(5, namedBindings__);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -491,17 +455,21 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.GqlQuery)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.GqlQuery other = (com.google.datastore.v1.GqlQuery) obj;
 
-    if (!getQueryString().equals(other.getQueryString())) return false;
-    if (getAllowLiterals() != other.getAllowLiterals()) return false;
-    if (!internalGetNamedBindings().equals(other.internalGetNamedBindings())) return false;
-    if (!getPositionalBindingsList().equals(other.getPositionalBindingsList())) return false;
+    if (!getQueryString()
+        .equals(other.getQueryString())) return false;
+    if (getAllowLiterals()
+        != other.getAllowLiterals()) return false;
+    if (!internalGetNamedBindings().equals(
+        other.internalGetNamedBindings())) return false;
+    if (!getPositionalBindingsList()
+        .equals(other.getPositionalBindingsList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -516,7 +484,8 @@ public int hashCode() {
     hash = (37 * hash) + QUERY_STRING_FIELD_NUMBER;
     hash = (53 * hash) + getQueryString().hashCode();
     hash = (37 * hash) + ALLOW_LITERALS_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getAllowLiterals());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getAllowLiterals());
     if (!internalGetNamedBindings().getMap().isEmpty()) {
       hash = (37 * hash) + NAMED_BINDINGS_FIELD_NUMBER;
       hash = (53 * hash) + internalGetNamedBindings().hashCode();
@@ -530,103 +499,97 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.GqlQuery parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.GqlQuery parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.GqlQuery parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.GqlQuery parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.GqlQuery parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.GqlQuery parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.GqlQuery parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.GqlQuery parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.GqlQuery parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.GqlQuery parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.GqlQuery parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.GqlQuery parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.GqlQuery parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.GqlQuery parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.GqlQuery prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A [GQL
    * query](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
@@ -634,43 +597,43 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * Protobuf type {@code google.datastore.v1.GqlQuery}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.GqlQuery)
       com.google.datastore.v1.GqlQueryOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_GqlQuery_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMapField(int number) {
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
       switch (number) {
         case 5:
           return internalGetNamedBindings();
         default:
-          throw new RuntimeException("Invalid map field number: " + number);
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
       }
     }
-
     @SuppressWarnings({"rawtypes"})
-    protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
+    protected com.google.protobuf.MapField internalGetMutableMapField(
+        int number) {
       switch (number) {
         case 5:
           return internalGetMutableNamedBindings();
         default:
-          throw new RuntimeException("Invalid map field number: " + number);
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
       }
     }
-
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.GqlQuery.class,
-              com.google.datastore.v1.GqlQuery.Builder.class);
+              com.google.datastore.v1.GqlQuery.class, com.google.datastore.v1.GqlQuery.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.GqlQuery.newBuilder()
@@ -678,17 +641,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getPositionalBindingsFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -707,9 +670,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_GqlQuery_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor;
     }
 
     @java.lang.Override
@@ -751,39 +714,38 @@ public com.google.datastore.v1.GqlQuery buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.GqlQuery) {
-        return mergeFrom((com.google.datastore.v1.GqlQuery) other);
+        return mergeFrom((com.google.datastore.v1.GqlQuery)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -799,7 +761,8 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) {
       if (other.getAllowLiterals() != false) {
         setAllowLiterals(other.getAllowLiterals());
       }
-      internalGetMutableNamedBindings().mergeFrom(other.internalGetNamedBindings());
+      internalGetMutableNamedBindings().mergeFrom(
+          other.internalGetNamedBindings());
       if (positionalBindingsBuilder_ == null) {
         if (!other.positionalBindings_.isEmpty()) {
           if (positionalBindings_.isEmpty()) {
@@ -818,10 +781,9 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) {
             positionalBindingsBuilder_ = null;
             positionalBindings_ = other.positionalBindings_;
             bitField0_ = (bitField0_ & ~0x00000002);
-            positionalBindingsBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getPositionalBindingsFieldBuilder()
-                    : null;
+            positionalBindingsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getPositionalBindingsFieldBuilder() : null;
           } else {
             positionalBindingsBuilder_.addAllMessages(other.positionalBindings_);
           }
@@ -855,26 +817,23 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
     private java.lang.Object queryString_ = "";
     /**
-     *
-     *
      * 
      * A string of the format described
      * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
      * 

      *
      * string query_string = 1;
-     *
      * @return The queryString.
      */
     public java.lang.String getQueryString() {
       java.lang.Object ref = queryString_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         queryString_ = s;
         return s;
@@ -883,22 +842,21 @@ public java.lang.String getQueryString() {
       }
     }
     /**
-     *
-     *
      * 
      * A string of the format described
      * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
      * 

      *
      * string query_string = 1;
-     *
      * @return The bytes for queryString.
      */
-    public com.google.protobuf.ByteString getQueryStringBytes() {
+    public com.google.protobuf.ByteString
+        getQueryStringBytes() {
       java.lang.Object ref = queryString_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         queryString_ = b;
         return b;
       } else {
@@ -906,73 +864,64 @@ public com.google.protobuf.ByteString getQueryStringBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * A string of the format described
      * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
      * 

      *
      * string query_string = 1;
-     *
      * @param value The queryString to set.
      * @return This builder for chaining.
      */
-    public Builder setQueryString(java.lang.String value) {
+    public Builder setQueryString(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       queryString_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * A string of the format described
      * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
      * 

      *
      * string query_string = 1;
-     *
      * @return This builder for chaining.
      */
     public Builder clearQueryString() {
-
+      
       queryString_ = getDefaultInstance().getQueryString();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * A string of the format described
      * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
      * 

      *
      * string query_string = 1;
-     *
      * @param value The bytes for queryString to set.
      * @return This builder for chaining.
      */
-    public Builder setQueryStringBytes(com.google.protobuf.ByteString value) {
+    public Builder setQueryStringBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       queryString_ = value;
       onChanged();
       return this;
     }
 
-    private boolean allowLiterals_;
+    private boolean allowLiterals_ ;
     /**
-     *
-     *
      * 
      * When false, the query string must not contain any literals and instead must
      * bind all values. For example,
@@ -981,15 +930,12 @@ public Builder setQueryStringBytes(com.google.protobuf.ByteString value) {
      * 

      *
      * bool allow_literals = 2;
-     *
      * @return The allowLiterals.
      */
     public boolean getAllowLiterals() {
       return allowLiterals_;
     }
     /**
-     *
-     *
      * 
      * When false, the query string must not contain any literals and instead must
      * bind all values. For example,
@@ -998,19 +944,16 @@ public boolean getAllowLiterals() {
      * 

      *
      * bool allow_literals = 2;
-     *
      * @param value The allowLiterals to set.
      * @return This builder for chaining.
      */
     public Builder setAllowLiterals(boolean value) {
-
+      
       allowLiterals_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * When false, the query string must not contain any literals and instead must
      * bind all values. For example,
@@ -1019,38 +962,31 @@ public Builder setAllowLiterals(boolean value) {
      * 

      *
      * bool allow_literals = 2;
-     *
      * @return This builder for chaining.
      */
     public Builder clearAllowLiterals() {
-
+      
       allowLiterals_ = false;
       onChanged();
       return this;
     }
 
     private com.google.protobuf.MapField<
-            java.lang.String, com.google.datastore.v1.GqlQueryParameter>
-        namedBindings_;
-
-    private com.google.protobuf.MapField<
-            java.lang.String, com.google.datastore.v1.GqlQueryParameter>
-        internalGetNamedBindings() {
+        java.lang.String, com.google.datastore.v1.GqlQueryParameter> namedBindings_;
+    private com.google.protobuf.MapField
+    internalGetNamedBindings() {
       if (namedBindings_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
             NamedBindingsDefaultEntryHolder.defaultEntry);
       }
       return namedBindings_;
     }
-
-    private com.google.protobuf.MapField<
-            java.lang.String, com.google.datastore.v1.GqlQueryParameter>
-        internalGetMutableNamedBindings() {
-      onChanged();
-      ;
+    private com.google.protobuf.MapField
+    internalGetMutableNamedBindings() {
+      onChanged();;
       if (namedBindings_ == null) {
-        namedBindings_ =
-            com.google.protobuf.MapField.newMapField(NamedBindingsDefaultEntryHolder.defaultEntry);
+        namedBindings_ = com.google.protobuf.MapField.newMapField(
+            NamedBindingsDefaultEntryHolder.defaultEntry);
       }
       if (!namedBindings_.isMutable()) {
         namedBindings_ = namedBindings_.copy();
@@ -1062,8 +998,6 @@ public int getNamedBindingsCount() {
       return internalGetNamedBindings().getMap().size();
     }
     /**
-     *
-     *
      * 
      * For each non-reserved named binding site in the query string, there must be
      * a named parameter with that name, but not necessarily the inverse.
@@ -1073,21 +1007,20 @@ public int getNamedBindingsCount() {
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
-    public boolean containsNamedBindings(java.lang.String key) {
-      if (key == null) {
-        throw new java.lang.NullPointerException();
-      }
+
+    public boolean containsNamedBindings(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
       return internalGetNamedBindings().getMap().containsKey(key);
     }
-    /** Use {@link #getNamedBindingsMap()} instead. */
+    /**
+     * Use {@link #getNamedBindingsMap()} instead.
+     */
     @java.lang.Deprecated
-    public java.util.Map
-        getNamedBindings() {
+    public java.util.Map getNamedBindings() {
       return getNamedBindingsMap();
     }
     /**
-     *
-     *
      * 
      * For each non-reserved named binding site in the query string, there must be
      * a named parameter with that name, but not necessarily the inverse.
@@ -1097,13 +1030,11 @@ public boolean containsNamedBindings(java.lang.String key) {
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
-    public java.util.Map
-        getNamedBindingsMap() {
+
+    public java.util.Map getNamedBindingsMap() {
       return internalGetNamedBindings().getMap();
     }
     /**
-     *
-     *
      * 
      * For each non-reserved named binding site in the query string, there must be
      * a named parameter with that name, but not necessarily the inverse.
@@ -1113,18 +1044,16 @@ public boolean containsNamedBindings(java.lang.String key) {
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
+
     public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
-        java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue) {
-      if (key == null) {
-        throw new java.lang.NullPointerException();
-      }
+        java.lang.String key,
+        com.google.datastore.v1.GqlQueryParameter defaultValue) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
       java.util.Map map =
           internalGetNamedBindings().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     *
-     *
      * 
      * For each non-reserved named binding site in the query string, there must be
      * a named parameter with that name, but not necessarily the inverse.
@@ -1134,10 +1063,10 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
-    public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.lang.String key) {
-      if (key == null) {
-        throw new java.lang.NullPointerException();
-      }
+
+    public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
       java.util.Map map =
           internalGetNamedBindings().getMap();
       if (!map.containsKey(key)) {
@@ -1147,12 +1076,11 @@ public com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.la
     }
 
     public Builder clearNamedBindings() {
-      internalGetMutableNamedBindings().getMutableMap().clear();
+      internalGetMutableNamedBindings().getMutableMap()
+          .clear();
       return this;
     }
     /**
-     *
-     *
      * 
      * For each non-reserved named binding site in the query string, there must be
      * a named parameter with that name, but not necessarily the inverse.
@@ -1162,22 +1090,23 @@ public Builder clearNamedBindings() {
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
-    public Builder removeNamedBindings(java.lang.String key) {
-      if (key == null) {
-        throw new java.lang.NullPointerException();
-      }
-      internalGetMutableNamedBindings().getMutableMap().remove(key);
+
+    public Builder removeNamedBindings(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableNamedBindings().getMutableMap()
+          .remove(key);
       return this;
     }
-    /** Use alternate mutation accessors instead. */
+    /**
+     * Use alternate mutation accessors instead.
+     */
     @java.lang.Deprecated
     public java.util.Map
-        getMutableNamedBindings() {
+    getMutableNamedBindings() {
       return internalGetMutableNamedBindings().getMutableMap();
     }
     /**
-     *
-     *
      * 
      * For each non-reserved named binding site in the query string, there must be
      * a named parameter with that name, but not necessarily the inverse.
@@ -1188,19 +1117,15 @@ public Builder removeNamedBindings(java.lang.String key) {
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
     public Builder putNamedBindings(
-        java.lang.String key, com.google.datastore.v1.GqlQueryParameter value) {
-      if (key == null) {
-        throw new java.lang.NullPointerException();
-      }
-      if (value == null) {
-        throw new java.lang.NullPointerException();
-      }
-      internalGetMutableNamedBindings().getMutableMap().put(key, value);
+        java.lang.String key,
+        com.google.datastore.v1.GqlQueryParameter value) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      if (value == null) { throw new java.lang.NullPointerException(); }
+      internalGetMutableNamedBindings().getMutableMap()
+          .put(key, value);
       return this;
     }
     /**
-     *
-     *
      * 
      * For each non-reserved named binding site in the query string, there must be
      * a named parameter with that name, but not necessarily the inverse.
@@ -1210,32 +1135,27 @@ public Builder putNamedBindings(
      *
      * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
      */
+
     public Builder putAllNamedBindings(
         java.util.Map values) {
-      internalGetMutableNamedBindings().getMutableMap().putAll(values);
+      internalGetMutableNamedBindings().getMutableMap()
+          .putAll(values);
       return this;
     }
 
     private java.util.List positionalBindings_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensurePositionalBindingsIsMutable() {
       if (!((bitField0_ & 0x00000002) != 0)) {
-        positionalBindings_ =
-            new java.util.ArrayList(positionalBindings_);
+        positionalBindings_ = new java.util.ArrayList(positionalBindings_);
         bitField0_ |= 0x00000002;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.GqlQueryParameter,
-            com.google.datastore.v1.GqlQueryParameter.Builder,
-            com.google.datastore.v1.GqlQueryParameterOrBuilder>
-        positionalBindingsBuilder_;
+        com.google.datastore.v1.GqlQueryParameter, com.google.datastore.v1.GqlQueryParameter.Builder, com.google.datastore.v1.GqlQueryParameterOrBuilder> positionalBindingsBuilder_;
 
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1253,8 +1173,6 @@ public java.util.List getPositionalBi
       }
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1272,8 +1190,6 @@ public int getPositionalBindingsCount() {
       }
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1291,8 +1207,6 @@ public com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index
       }
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1317,8 +1231,6 @@ public Builder setPositionalBindings(
       return this;
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1340,8 +1252,6 @@ public Builder setPositionalBindings(
       return this;
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1365,8 +1275,6 @@ public Builder addPositionalBindings(com.google.datastore.v1.GqlQueryParameter v
       return this;
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1391,8 +1299,6 @@ public Builder addPositionalBindings(
       return this;
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1414,8 +1320,6 @@ public Builder addPositionalBindings(
       return this;
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1437,8 +1341,6 @@ public Builder addPositionalBindings(
       return this;
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1452,7 +1354,8 @@ public Builder addAllPositionalBindings(
         java.lang.Iterable values) {
       if (positionalBindingsBuilder_ == null) {
         ensurePositionalBindingsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, positionalBindings_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, positionalBindings_);
         onChanged();
       } else {
         positionalBindingsBuilder_.addAllMessages(values);
@@ -1460,8 +1363,6 @@ public Builder addAllPositionalBindings(
       return this;
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1482,8 +1383,6 @@ public Builder clearPositionalBindings() {
       return this;
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1504,8 +1403,6 @@ public Builder removePositionalBindings(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1520,8 +1417,6 @@ public com.google.datastore.v1.GqlQueryParameter.Builder getPositionalBindingsBu
       return getPositionalBindingsFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1534,14 +1429,11 @@ public com.google.datastore.v1.GqlQueryParameter.Builder getPositionalBindingsBu
     public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsOrBuilder(
         int index) {
       if (positionalBindingsBuilder_ == null) {
-        return positionalBindings_.get(index);
-      } else {
+        return positionalBindings_.get(index);  } else {
         return positionalBindingsBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1551,8 +1443,8 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
      *
      * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
      */
-    public java.util.List
-        getPositionalBindingsOrBuilderList() {
+    public java.util.List 
+         getPositionalBindingsOrBuilderList() {
       if (positionalBindingsBuilder_ != null) {
         return positionalBindingsBuilder_.getMessageOrBuilderList();
       } else {
@@ -1560,8 +1452,6 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
       }
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1572,12 +1462,10 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
      * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
      */
     public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBuilder() {
-      return getPositionalBindingsFieldBuilder()
-          .addBuilder(com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
+      return getPositionalBindingsFieldBuilder().addBuilder(
+          com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1589,12 +1477,10 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
      */
     public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBuilder(
         int index) {
-      return getPositionalBindingsFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
+      return getPositionalBindingsFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.GqlQueryParameter.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Numbered binding site @1 references the first numbered parameter,
      * effectively using 1-based indexing, rather than the usual 0.
@@ -1604,22 +1490,16 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
      *
      * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
      */
-    public java.util.List
-        getPositionalBindingsBuilderList() {
+    public java.util.List 
+         getPositionalBindingsBuilderList() {
       return getPositionalBindingsFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.GqlQueryParameter,
-            com.google.datastore.v1.GqlQueryParameter.Builder,
-            com.google.datastore.v1.GqlQueryParameterOrBuilder>
+        com.google.datastore.v1.GqlQueryParameter, com.google.datastore.v1.GqlQueryParameter.Builder, com.google.datastore.v1.GqlQueryParameterOrBuilder> 
         getPositionalBindingsFieldBuilder() {
       if (positionalBindingsBuilder_ == null) {
-        positionalBindingsBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.GqlQueryParameter,
-                com.google.datastore.v1.GqlQueryParameter.Builder,
-                com.google.datastore.v1.GqlQueryParameterOrBuilder>(
+        positionalBindingsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.GqlQueryParameter, com.google.datastore.v1.GqlQueryParameter.Builder, com.google.datastore.v1.GqlQueryParameterOrBuilder>(
                 positionalBindings_,
                 ((bitField0_ & 0x00000002) != 0),
                 getParentForChildren(),
@@ -1628,9 +1508,9 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
       }
       return positionalBindingsBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1640,12 +1520,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.GqlQuery)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.GqlQuery)
   private static final com.google.datastore.v1.GqlQuery DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.GqlQuery();
   }
@@ -1654,16 +1534,16 @@ public static com.google.datastore.v1.GqlQuery getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public GqlQuery parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new GqlQuery(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public GqlQuery parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new GqlQuery(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1678,4 +1558,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java
index 15ede8cc4..6d04957f8 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryOrBuilder.java
@@ -18,41 +18,33 @@
 
 package com.google.datastore.v1;
 
-public interface GqlQueryOrBuilder
-    extends
+public interface GqlQueryOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.GqlQuery)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * A string of the format described
    * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
    * 

    *
    * string query_string = 1;
-   *
    * @return The queryString.
    */
   java.lang.String getQueryString();
   /**
-   *
-   *
    * 
    * A string of the format described
    * [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference).
    * 

    *
    * string query_string = 1;
-   *
    * @return The bytes for queryString.
    */
-  com.google.protobuf.ByteString getQueryStringBytes();
+  com.google.protobuf.ByteString
+      getQueryStringBytes();
 
   /**
-   *
-   *
    * 
    * When false, the query string must not contain any literals and instead must
    * bind all values. For example,
@@ -61,14 +53,11 @@ public interface GqlQueryOrBuilder
    * 

    *
    * bool allow_literals = 2;
-   *
    * @return The allowLiterals.
    */
   boolean getAllowLiterals();
 
   /**
-   *
-   *
    * 
    * For each non-reserved named binding site in the query string, there must be
    * a named parameter with that name, but not necessarily the inverse.
@@ -80,8 +69,6 @@ public interface GqlQueryOrBuilder
    */
   int getNamedBindingsCount();
   /**
-   *
-   *
    * 
    * For each non-reserved named binding site in the query string, there must be
    * a named parameter with that name, but not necessarily the inverse.
@@ -91,13 +78,15 @@ public interface GqlQueryOrBuilder
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-  boolean containsNamedBindings(java.lang.String key);
-  /** Use {@link #getNamedBindingsMap()} instead. */
+  boolean containsNamedBindings(
+      java.lang.String key);
+  /**
+   * Use {@link #getNamedBindingsMap()} instead.
+   */
   @java.lang.Deprecated
-  java.util.Map getNamedBindings();
+  java.util.Map
+  getNamedBindings();
   /**
-   *
-   *
    * 
    * For each non-reserved named binding site in the query string, there must be
    * a named parameter with that name, but not necessarily the inverse.
@@ -107,10 +96,9 @@ public interface GqlQueryOrBuilder
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-  java.util.Map getNamedBindingsMap();
+  java.util.Map
+  getNamedBindingsMap();
   /**
-   *
-   *
    * 
    * For each non-reserved named binding site in the query string, there must be
    * a named parameter with that name, but not necessarily the inverse.
@@ -120,11 +108,11 @@ public interface GqlQueryOrBuilder
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
+
   com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
-      java.lang.String key, com.google.datastore.v1.GqlQueryParameter defaultValue);
+      java.lang.String key,
+      com.google.datastore.v1.GqlQueryParameter defaultValue);
   /**
-   *
-   *
    * 
    * For each non-reserved named binding site in the query string, there must be
    * a named parameter with that name, but not necessarily the inverse.
@@ -134,11 +122,11 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    *
    * map<string, .google.datastore.v1.GqlQueryParameter> named_bindings = 5;
    */
-  com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(java.lang.String key);
+
+  com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrThrow(
+      java.lang.String key);
 
   /**
-   *
-   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -148,10 +136,9 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
-  java.util.List getPositionalBindingsList();
+  java.util.List 
+      getPositionalBindingsList();
   /**
-   *
-   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -163,8 +150,6 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    */
   com.google.datastore.v1.GqlQueryParameter getPositionalBindings(int index);
   /**
-   *
-   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -176,8 +161,6 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    */
   int getPositionalBindingsCount();
   /**
-   *
-   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -187,11 +170,9 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
-  java.util.List
+  java.util.List 
       getPositionalBindingsOrBuilderList();
   /**
-   *
-   *
    * 
    * Numbered binding site @1 references the first numbered parameter,
    * effectively using 1-based indexing, rather than the usual 0.
@@ -201,5 +182,6 @@ com.google.datastore.v1.GqlQueryParameter getNamedBindingsOrDefault(
    *
    * repeated .google.datastore.v1.GqlQueryParameter positional_bindings = 4;
    */
-  com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsOrBuilder(int index);
+  com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsOrBuilder(
+      int index);
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java
index 38c132e6c..f90cf1822 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java
@@ -19,37 +19,36 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A binding parameter for a GQL query.
  * 

  *
  * Protobuf type {@code google.datastore.v1.GqlQueryParameter}
  */
-public final class GqlQueryParameter extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class GqlQueryParameter extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.GqlQueryParameter)
     GqlQueryParameterOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use GqlQueryParameter.newBuilder() to construct.
   private GqlQueryParameter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private GqlQueryParameter() {}
+  private GqlQueryParameter() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new GqlQueryParameter();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private GqlQueryParameter(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -68,73 +67,66 @@ private GqlQueryParameter(
           case 0:
             done = true;
             break;
-          case 18:
-            {
-              com.google.datastore.v1.Value.Builder subBuilder = null;
-              if (parameterTypeCase_ == 2) {
-                subBuilder = ((com.google.datastore.v1.Value) parameterType_).toBuilder();
-              }
-              parameterType_ =
-                  input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Value) parameterType_);
-                parameterType_ = subBuilder.buildPartial();
-              }
-              parameterTypeCase_ = 2;
-              break;
+          case 18: {
+            com.google.datastore.v1.Value.Builder subBuilder = null;
+            if (parameterTypeCase_ == 2) {
+              subBuilder = ((com.google.datastore.v1.Value) parameterType_).toBuilder();
             }
-          case 26:
-            {
-              parameterTypeCase_ = 3;
-              parameterType_ = input.readBytes();
-              break;
+            parameterType_ =
+                input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.Value) parameterType_);
+              parameterType_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            parameterTypeCase_ = 2;
+            break;
+          }
+          case 26: {
+            parameterTypeCase_ = 3;
+            parameterType_ = input.readBytes();
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.GqlQueryParameter.class,
-            com.google.datastore.v1.GqlQueryParameter.Builder.class);
+            com.google.datastore.v1.GqlQueryParameter.class, com.google.datastore.v1.GqlQueryParameter.Builder.class);
   }
 
   private int parameterTypeCase_ = 0;
   private java.lang.Object parameterType_;
-
   public enum ParameterTypeCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
+      implements com.google.protobuf.Internal.EnumLite,
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     VALUE(2),
     CURSOR(3),
     PARAMETERTYPE_NOT_SET(0);
     private final int value;
-
     private ParameterTypeCase(int value) {
       this.value = value;
     }
@@ -150,61 +142,50 @@ public static ParameterTypeCase valueOf(int value) {
 
     public static ParameterTypeCase forNumber(int value) {
       switch (value) {
-        case 2:
-          return VALUE;
-        case 3:
-          return CURSOR;
-        case 0:
-          return PARAMETERTYPE_NOT_SET;
-        default:
-          return null;
+        case 2: return VALUE;
+        case 3: return CURSOR;
+        case 0: return PARAMETERTYPE_NOT_SET;
+        default: return null;
       }
     }
-
     public int getNumber() {
       return this.value;
     }
   };
 
-  public ParameterTypeCase getParameterTypeCase() {
-    return ParameterTypeCase.forNumber(parameterTypeCase_);
+  public ParameterTypeCase
+  getParameterTypeCase() {
+    return ParameterTypeCase.forNumber(
+        parameterTypeCase_);
   }
 
   public static final int VALUE_FIELD_NUMBER = 2;
   /**
-   *
-   *
    * 
    * A value parameter.
    * 

    *
    * .google.datastore.v1.Value value = 2;
-   *
    * @return Whether the value field is set.
    */
   public boolean hasValue() {
     return parameterTypeCase_ == 2;
   }
   /**
-   *
-   *
    * 
    * A value parameter.
    * 

    *
    * .google.datastore.v1.Value value = 2;
-   *
    * @return The value.
    */
   public com.google.datastore.v1.Value getValue() {
     if (parameterTypeCase_ == 2) {
-      return (com.google.datastore.v1.Value) parameterType_;
+       return (com.google.datastore.v1.Value) parameterType_;
     }
     return com.google.datastore.v1.Value.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * A value parameter.
    * 

@@ -213,22 +194,19 @@ public com.google.datastore.v1.Value getValue() {
    */
   public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
     if (parameterTypeCase_ == 2) {
-      return (com.google.datastore.v1.Value) parameterType_;
+       return (com.google.datastore.v1.Value) parameterType_;
     }
     return com.google.datastore.v1.Value.getDefaultInstance();
   }
 
   public static final int CURSOR_FIELD_NUMBER = 3;
   /**
-   *
-   *
    * 
    * A query cursor. Query cursors are returned in query
    * result batches.
    * 

    *
    * bytes cursor = 3;
-   *
    * @return The cursor.
    */
   public com.google.protobuf.ByteString getCursor() {
@@ -239,7 +217,6 @@ public com.google.protobuf.ByteString getCursor() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -251,12 +228,14 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (parameterTypeCase_ == 2) {
       output.writeMessage(2, (com.google.datastore.v1.Value) parameterType_);
     }
     if (parameterTypeCase_ == 3) {
-      output.writeBytes(3, (com.google.protobuf.ByteString) parameterType_);
+      output.writeBytes(
+          3, (com.google.protobuf.ByteString) parameterType_);
     }
     unknownFields.writeTo(output);
   }
@@ -268,14 +247,13 @@ public int getSerializedSize() {
 
     size = 0;
     if (parameterTypeCase_ == 2) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              2, (com.google.datastore.v1.Value) parameterType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, (com.google.datastore.v1.Value) parameterType_);
     }
     if (parameterTypeCase_ == 3) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeBytesSize(
-              3, (com.google.protobuf.ByteString) parameterType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(
+            3, (com.google.protobuf.ByteString) parameterType_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -285,21 +263,22 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.GqlQueryParameter)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.GqlQueryParameter other =
-        (com.google.datastore.v1.GqlQueryParameter) obj;
+    com.google.datastore.v1.GqlQueryParameter other = (com.google.datastore.v1.GqlQueryParameter) obj;
 
     if (!getParameterTypeCase().equals(other.getParameterTypeCase())) return false;
     switch (parameterTypeCase_) {
       case 2:
-        if (!getValue().equals(other.getValue())) return false;
+        if (!getValue()
+            .equals(other.getValue())) return false;
         break;
       case 3:
-        if (!getCursor().equals(other.getCursor())) return false;
+        if (!getCursor()
+            .equals(other.getCursor())) return false;
         break;
       case 0:
       default:
@@ -332,127 +311,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.GqlQueryParameter parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.GqlQueryParameter parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.GqlQueryParameter parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.GqlQueryParameter parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.GqlQueryParameter parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.GqlQueryParameter parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.GqlQueryParameter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A binding parameter for a GQL query.
    * 

    *
    * Protobuf type {@code google.datastore.v1.GqlQueryParameter}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.GqlQueryParameter)
       com.google.datastore.v1.GqlQueryParameterOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.GqlQueryParameter.class,
-              com.google.datastore.v1.GqlQueryParameter.Builder.class);
+              com.google.datastore.v1.GqlQueryParameter.class, com.google.datastore.v1.GqlQueryParameter.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.GqlQueryParameter.newBuilder()
@@ -460,15 +430,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -478,9 +449,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
     }
 
     @java.lang.Override
@@ -499,8 +470,7 @@ public com.google.datastore.v1.GqlQueryParameter build() {
 
     @java.lang.Override
     public com.google.datastore.v1.GqlQueryParameter buildPartial() {
-      com.google.datastore.v1.GqlQueryParameter result =
-          new com.google.datastore.v1.GqlQueryParameter(this);
+      com.google.datastore.v1.GqlQueryParameter result = new com.google.datastore.v1.GqlQueryParameter(this);
       if (parameterTypeCase_ == 2) {
         if (valueBuilder_ == null) {
           result.parameterType_ = parameterType_;
@@ -520,39 +490,38 @@ public com.google.datastore.v1.GqlQueryParameter buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.GqlQueryParameter) {
-        return mergeFrom((com.google.datastore.v1.GqlQueryParameter) other);
+        return mergeFrom((com.google.datastore.v1.GqlQueryParameter)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -562,20 +531,17 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.datastore.v1.GqlQueryParameter other) {
       if (other == com.google.datastore.v1.GqlQueryParameter.getDefaultInstance()) return this;
       switch (other.getParameterTypeCase()) {
-        case VALUE:
-          {
-            mergeValue(other.getValue());
-            break;
-          }
-        case CURSOR:
-          {
-            setCursor(other.getCursor());
-            break;
-          }
-        case PARAMETERTYPE_NOT_SET:
-          {
-            break;
-          }
+        case VALUE: {
+          mergeValue(other.getValue());
+          break;
+        }
+        case CURSOR: {
+          setCursor(other.getCursor());
+          break;
+        }
+        case PARAMETERTYPE_NOT_SET: {
+          break;
+        }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -605,12 +571,12 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int parameterTypeCase_ = 0;
     private java.lang.Object parameterType_;
-
-    public ParameterTypeCase getParameterTypeCase() {
-      return ParameterTypeCase.forNumber(parameterTypeCase_);
+    public ParameterTypeCase
+        getParameterTypeCase() {
+      return ParameterTypeCase.forNumber(
+          parameterTypeCase_);
     }
 
     public Builder clearParameterType() {
@@ -620,34 +586,26 @@ public Builder clearParameterType() {
       return this;
     }
 
+
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Value,
-            com.google.datastore.v1.Value.Builder,
-            com.google.datastore.v1.ValueOrBuilder>
-        valueBuilder_;
+        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> valueBuilder_;
     /**
-     *
-     *
      * 
      * A value parameter.
      * 

      *
      * .google.datastore.v1.Value value = 2;
-     *
      * @return Whether the value field is set.
      */
     public boolean hasValue() {
       return parameterTypeCase_ == 2;
     }
     /**
-     *
-     *
      * 
      * A value parameter.
      * 

      *
      * .google.datastore.v1.Value value = 2;
-     *
      * @return The value.
      */
     public com.google.datastore.v1.Value getValue() {
@@ -664,8 +622,6 @@ public com.google.datastore.v1.Value getValue() {
       }
     }
     /**
-     *
-     *
      * 
      * A value parameter.
      * 

@@ -686,15 +642,14 @@ public Builder setValue(com.google.datastore.v1.Value value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A value parameter.
      * 

      *
      * .google.datastore.v1.Value value = 2;
      */
-    public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
+    public Builder setValue(
+        com.google.datastore.v1.Value.Builder builderForValue) {
       if (valueBuilder_ == null) {
         parameterType_ = builderForValue.build();
         onChanged();
@@ -705,8 +660,6 @@ public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A value parameter.
      * 

@@ -715,13 +668,10 @@ public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
      */
     public Builder mergeValue(com.google.datastore.v1.Value value) {
       if (valueBuilder_ == null) {
-        if (parameterTypeCase_ == 2
-            && parameterType_ != com.google.datastore.v1.Value.getDefaultInstance()) {
-          parameterType_ =
-              com.google.datastore.v1.Value.newBuilder(
-                      (com.google.datastore.v1.Value) parameterType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (parameterTypeCase_ == 2 &&
+            parameterType_ != com.google.datastore.v1.Value.getDefaultInstance()) {
+          parameterType_ = com.google.datastore.v1.Value.newBuilder((com.google.datastore.v1.Value) parameterType_)
+              .mergeFrom(value).buildPartial();
         } else {
           parameterType_ = value;
         }
@@ -736,8 +686,6 @@ public Builder mergeValue(com.google.datastore.v1.Value value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A value parameter.
      * 

@@ -761,8 +709,6 @@ public Builder clearValue() {
       return this;
     }
     /**
-     *
-     *
      * 
      * A value parameter.
      * 

@@ -773,8 +719,6 @@ public com.google.datastore.v1.Value.Builder getValueBuilder() {
       return getValueFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * A value parameter.
      * 

@@ -792,8 +736,6 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * A value parameter.
      * 

@@ -801,38 +743,31 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
      * .google.datastore.v1.Value value = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Value,
-            com.google.datastore.v1.Value.Builder,
-            com.google.datastore.v1.ValueOrBuilder>
+        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> 
         getValueFieldBuilder() {
       if (valueBuilder_ == null) {
         if (!(parameterTypeCase_ == 2)) {
           parameterType_ = com.google.datastore.v1.Value.getDefaultInstance();
         }
-        valueBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Value,
-                com.google.datastore.v1.Value.Builder,
-                com.google.datastore.v1.ValueOrBuilder>(
-                (com.google.datastore.v1.Value) parameterType_, getParentForChildren(), isClean());
+        valueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder>(
+                (com.google.datastore.v1.Value) parameterType_,
+                getParentForChildren(),
+                isClean());
         parameterType_ = null;
       }
       parameterTypeCase_ = 2;
-      onChanged();
-      ;
+      onChanged();;
       return valueBuilder_;
     }
 
     /**
-     *
-     *
      * 
      * A query cursor. Query cursors are returned in query
      * result batches.
      * 

      *
      * bytes cursor = 3;
-     *
      * @return The cursor.
      */
     public com.google.protobuf.ByteString getCursor() {
@@ -842,37 +777,31 @@ public com.google.protobuf.ByteString getCursor() {
       return com.google.protobuf.ByteString.EMPTY;
     }
     /**
-     *
-     *
      * 
      * A query cursor. Query cursors are returned in query
      * result batches.
      * 

      *
      * bytes cursor = 3;
-     *
      * @param value The cursor to set.
      * @return This builder for chaining.
      */
     public Builder setCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      parameterTypeCase_ = 3;
+    throw new NullPointerException();
+  }
+  parameterTypeCase_ = 3;
       parameterType_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * A query cursor. Query cursors are returned in query
      * result batches.
      * 

      *
      * bytes cursor = 3;
-     *
      * @return This builder for chaining.
      */
     public Builder clearCursor() {
@@ -883,9 +812,9 @@ public Builder clearCursor() {
       }
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -895,12 +824,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.GqlQueryParameter)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.GqlQueryParameter)
   private static final com.google.datastore.v1.GqlQueryParameter DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.GqlQueryParameter();
   }
@@ -909,16 +838,16 @@ public static com.google.datastore.v1.GqlQueryParameter getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public GqlQueryParameter parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new GqlQueryParameter(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public GqlQueryParameter parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new GqlQueryParameter(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -933,4 +862,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java
index 88d62712f..9c9dbb950 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameterOrBuilder.java
@@ -18,38 +18,29 @@
 
 package com.google.datastore.v1;
 
-public interface GqlQueryParameterOrBuilder
-    extends
+public interface GqlQueryParameterOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.GqlQueryParameter)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * A value parameter.
    * 

    *
    * .google.datastore.v1.Value value = 2;
-   *
    * @return Whether the value field is set.
    */
   boolean hasValue();
   /**
-   *
-   *
    * 
    * A value parameter.
    * 

    *
    * .google.datastore.v1.Value value = 2;
-   *
    * @return The value.
    */
   com.google.datastore.v1.Value getValue();
   /**
-   *
-   *
    * 
    * A value parameter.
    * 

@@ -59,15 +50,12 @@ public interface GqlQueryParameterOrBuilder
   com.google.datastore.v1.ValueOrBuilder getValueOrBuilder();
 
   /**
-   *
-   *
    * 
    * A query cursor. Query cursors are returned in query
    * result batches.
    * 

    *
    * bytes cursor = 3;
-   *
    * @return The cursor.
    */
   com.google.protobuf.ByteString getCursor();
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java
index 3b418fb69..287552e4a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java
@@ -19,8 +19,6 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A unique identifier for an entity.
  * If a key's partition ID or any of its path kinds or names are
@@ -30,31 +28,31 @@
  *
  * Protobuf type {@code google.datastore.v1.Key}
  */
-public final class Key extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class Key extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Key)
     KeyOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use Key.newBuilder() to construct.
   private Key(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private Key() {
     path_ = java.util.Collections.emptyList();
   }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new Key();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private Key(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -74,46 +72,42 @@ private Key(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              com.google.datastore.v1.PartitionId.Builder subBuilder = null;
-              if (partitionId_ != null) {
-                subBuilder = partitionId_.toBuilder();
-              }
-              partitionId_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PartitionId.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(partitionId_);
-                partitionId_ = subBuilder.buildPartial();
-              }
-
-              break;
+          case 10: {
+            com.google.datastore.v1.PartitionId.Builder subBuilder = null;
+            if (partitionId_ != null) {
+              subBuilder = partitionId_.toBuilder();
             }
-          case 18:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                path_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              path_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry));
-              break;
+            partitionId_ = input.readMessage(com.google.datastore.v1.PartitionId.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(partitionId_);
+              partitionId_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+
+            break;
+          }
+          case 18: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              path_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
+            }
+            path_.add(
+                input.readMessage(com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry));
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) != 0)) {
         path_ = java.util.Collections.unmodifiableList(path_);
@@ -122,28 +116,24 @@ private Key(
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.EntityProto
-        .internal_static_google_datastore_v1_Key_fieldAccessorTable
+    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.Key.class, com.google.datastore.v1.Key.Builder.class);
   }
 
-  public interface PathElementOrBuilder
-      extends
+  public interface PathElementOrBuilder extends
       // @@protoc_insertion_point(interface_extends:google.datastore.v1.Key.PathElement)
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     *
-     *
      * 
      * The kind of the entity.
      * A kind matching regex `__.*__` is reserved/read-only.
@@ -152,13 +142,10 @@ public interface PathElementOrBuilder
      * 

      *
      * string kind = 1;
-     *
      * @return The kind.
      */
     java.lang.String getKind();
     /**
-     *
-     *
      * 
      * The kind of the entity.
      * A kind matching regex `__.*__` is reserved/read-only.
@@ -167,14 +154,12 @@ public interface PathElementOrBuilder
      * 

      *
      * string kind = 1;
-     *
      * @return The bytes for kind.
      */
-    com.google.protobuf.ByteString getKindBytes();
+    com.google.protobuf.ByteString
+        getKindBytes();
 
     /**
-     *
-     *
      * 
      * The auto-allocated ID of the entity.
      * Never equal to zero. Values less than zero are discouraged and may not
@@ -182,14 +167,11 @@ public interface PathElementOrBuilder
      * 

      *
      * int64 id = 2;
-     *
      * @return The id.
      */
     long getId();
 
     /**
-     *
-     *
      * 
      * The name of the entity.
      * A name matching regex `__.*__` is reserved/read-only.
@@ -198,13 +180,10 @@ public interface PathElementOrBuilder
      * 

      *
      * string name = 3;
-     *
      * @return The name.
      */
     java.lang.String getName();
     /**
-     *
-     *
      * 
      * The name of the entity.
      * A name matching regex `__.*__` is reserved/read-only.
@@ -213,16 +192,14 @@ public interface PathElementOrBuilder
      * 

      *
      * string name = 3;
-     *
      * @return The bytes for name.
      */
-    com.google.protobuf.ByteString getNameBytes();
+    com.google.protobuf.ByteString
+        getNameBytes();
 
     public com.google.datastore.v1.Key.PathElement.IdTypeCase getIdTypeCase();
   }
   /**
-   *
-   *
    * 
    * A (kind, ID/name) pair used to construct a key path.
    * If either name or ID is set, the element is complete.
@@ -231,31 +208,31 @@ public interface PathElementOrBuilder
    *
    * Protobuf type {@code google.datastore.v1.Key.PathElement}
    */
-  public static final class PathElement extends com.google.protobuf.GeneratedMessageV3
-      implements
+  public  static final class PathElement extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.datastore.v1.Key.PathElement)
       PathElementOrBuilder {
-    private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
     // Use PathElement.newBuilder() to construct.
     private PathElement(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-
     private PathElement() {
       kind_ = "";
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
       return new PathElement();
     }
 
     @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
       return this.unknownFields;
     }
-
     private PathElement(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -274,72 +251,64 @@ private PathElement(
             case 0:
               done = true;
               break;
-            case 10:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
+            case 10: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-                kind_ = s;
-                break;
-              }
-            case 16:
-              {
-                idTypeCase_ = 2;
-                idType_ = input.readInt64();
-                break;
-              }
-            case 26:
-              {
-                java.lang.String s = input.readStringRequireUtf8();
-                idTypeCase_ = 3;
-                idType_ = s;
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
+              kind_ = s;
+              break;
+            }
+            case 16: {
+              idTypeCase_ = 2;
+              idType_ = input.readInt64();
+              break;
+            }
+            case 26: {
+              java.lang.String s = input.readStringRequireUtf8();
+              idTypeCase_ = 3;
+              idType_ = s;
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
               }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_Key_PathElement_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.Key.PathElement.class,
-              com.google.datastore.v1.Key.PathElement.Builder.class);
+              com.google.datastore.v1.Key.PathElement.class, com.google.datastore.v1.Key.PathElement.Builder.class);
     }
 
     private int idTypeCase_ = 0;
     private java.lang.Object idType_;
-
     public enum IdTypeCase
-        implements
-            com.google.protobuf.Internal.EnumLite,
+        implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
       ID(2),
       NAME(3),
       IDTYPE_NOT_SET(0);
       private final int value;
-
       private IdTypeCase(int value) {
         this.value = value;
       }
@@ -355,31 +324,26 @@ public static IdTypeCase valueOf(int value) {
 
       public static IdTypeCase forNumber(int value) {
         switch (value) {
-          case 2:
-            return ID;
-          case 3:
-            return NAME;
-          case 0:
-            return IDTYPE_NOT_SET;
-          default:
-            return null;
+          case 2: return ID;
+          case 3: return NAME;
+          case 0: return IDTYPE_NOT_SET;
+          default: return null;
         }
       }
-
       public int getNumber() {
         return this.value;
       }
     };
 
-    public IdTypeCase getIdTypeCase() {
-      return IdTypeCase.forNumber(idTypeCase_);
+    public IdTypeCase
+    getIdTypeCase() {
+      return IdTypeCase.forNumber(
+          idTypeCase_);
     }
 
     public static final int KIND_FIELD_NUMBER = 1;
     private volatile java.lang.Object kind_;
     /**
-     *
-     *
      * 
      * The kind of the entity.
      * A kind matching regex `__.*__` is reserved/read-only.
@@ -388,7 +352,6 @@ public IdTypeCase getIdTypeCase() {
      * 

      *
      * string kind = 1;
-     *
      * @return The kind.
      */
     public java.lang.String getKind() {
@@ -396,15 +359,14 @@ public java.lang.String getKind() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         kind_ = s;
         return s;
       }
     }
     /**
-     *
-     *
      * 
      * The kind of the entity.
      * A kind matching regex `__.*__` is reserved/read-only.
@@ -413,14 +375,15 @@ public java.lang.String getKind() {
      * 

      *
      * string kind = 1;
-     *
      * @return The bytes for kind.
      */
-    public com.google.protobuf.ByteString getKindBytes() {
+    public com.google.protobuf.ByteString
+        getKindBytes() {
       java.lang.Object ref = kind_;
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         kind_ = b;
         return b;
       } else {
@@ -430,8 +393,6 @@ public com.google.protobuf.ByteString getKindBytes() {
 
     public static final int ID_FIELD_NUMBER = 2;
     /**
-     *
-     *
      * 
      * The auto-allocated ID of the entity.
      * Never equal to zero. Values less than zero are discouraged and may not
@@ -439,7 +400,6 @@ public com.google.protobuf.ByteString getKindBytes() {
      * 

      *
      * int64 id = 2;
-     *
      * @return The id.
      */
     public long getId() {
@@ -451,8 +411,6 @@ public long getId() {
 
     public static final int NAME_FIELD_NUMBER = 3;
     /**
-     *
-     *
      * 
      * The name of the entity.
      * A name matching regex `__.*__` is reserved/read-only.
@@ -461,7 +419,6 @@ public long getId() {
      * 

      *
      * string name = 3;
-     *
      * @return The name.
      */
     public java.lang.String getName() {
@@ -472,7 +429,8 @@ public java.lang.String getName() {
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (idTypeCase_ == 3) {
           idType_ = s;
@@ -481,8 +439,6 @@ public java.lang.String getName() {
       }
     }
     /**
-     *
-     *
      * 
      * The name of the entity.
      * A name matching regex `__.*__` is reserved/read-only.
@@ -491,17 +447,18 @@ public java.lang.String getName() {
      * 

      *
      * string name = 3;
-     *
      * @return The bytes for name.
      */
-    public com.google.protobuf.ByteString getNameBytes() {
+    public com.google.protobuf.ByteString
+        getNameBytes() {
       java.lang.Object ref = "";
       if (idTypeCase_ == 3) {
         ref = idType_;
       }
       if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         if (idTypeCase_ == 3) {
           idType_ = b;
         }
@@ -512,7 +469,6 @@ public com.google.protobuf.ByteString getNameBytes() {
     }
 
     private byte memoizedIsInitialized = -1;
-
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -524,12 +480,14 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       if (!getKindBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kind_);
       }
       if (idTypeCase_ == 2) {
-        output.writeInt64(2, (long) ((java.lang.Long) idType_));
+        output.writeInt64(
+            2, (long)((java.lang.Long) idType_));
       }
       if (idTypeCase_ == 3) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, idType_);
@@ -547,9 +505,9 @@ public int getSerializedSize() {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, kind_);
       }
       if (idTypeCase_ == 2) {
-        size +=
-            com.google.protobuf.CodedOutputStream.computeInt64Size(
-                2, (long) ((java.lang.Long) idType_));
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(
+              2, (long)((java.lang.Long) idType_));
       }
       if (idTypeCase_ == 3) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, idType_);
@@ -562,21 +520,24 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof com.google.datastore.v1.Key.PathElement)) {
         return super.equals(obj);
       }
       com.google.datastore.v1.Key.PathElement other = (com.google.datastore.v1.Key.PathElement) obj;
 
-      if (!getKind().equals(other.getKind())) return false;
+      if (!getKind()
+          .equals(other.getKind())) return false;
       if (!getIdTypeCase().equals(other.getIdTypeCase())) return false;
       switch (idTypeCase_) {
         case 2:
-          if (getId() != other.getId()) return false;
+          if (getId()
+              != other.getId()) return false;
           break;
         case 3:
-          if (!getName().equals(other.getName())) return false;
+          if (!getName()
+              .equals(other.getName())) return false;
           break;
         case 0:
         default:
@@ -597,7 +558,8 @@ public int hashCode() {
       switch (idTypeCase_) {
         case 2:
           hash = (37 * hash) + ID_FIELD_NUMBER;
-          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getId());
+          hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+              getId());
           break;
         case 3:
           hash = (37 * hash) + NAME_FIELD_NUMBER;
@@ -611,94 +573,88 @@ public int hashCode() {
       return hash;
     }
 
-    public static com.google.datastore.v1.Key.PathElement parseFrom(java.nio.ByteBuffer data)
+    public static com.google.datastore.v1.Key.PathElement parseFrom(
+        java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static com.google.datastore.v1.Key.PathElement parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static com.google.datastore.v1.Key.PathElement parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static com.google.datastore.v1.Key.PathElement parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static com.google.datastore.v1.Key.PathElement parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static com.google.datastore.v1.Key.PathElement parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static com.google.datastore.v1.Key.PathElement parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static com.google.datastore.v1.Key.PathElement parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
-
-    public static com.google.datastore.v1.Key.PathElement parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    public static com.google.datastore.v1.Key.PathElement parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
-
     public static com.google.datastore.v1.Key.PathElement parseDelimitedFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static com.google.datastore.v1.Key.PathElement parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static com.google.datastore.v1.Key.PathElement parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
     public static Builder newBuilder(com.google.datastore.v1.Key.PathElement prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
@@ -708,8 +664,6 @@ protected Builder newBuilderForType(
       return builder;
     }
     /**
-     *
-     *
      * 
      * A (kind, ID/name) pair used to construct a key path.
      * If either name or ID is set, the element is complete.
@@ -718,24 +672,21 @@ protected Builder newBuilderForType(
      *
      * Protobuf type {@code google.datastore.v1.Key.PathElement}
      */
-    public static final class Builder
-        extends com.google.protobuf.GeneratedMessageV3.Builder
-        implements
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:google.datastore.v1.Key.PathElement)
         com.google.datastore.v1.Key.PathElementOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.datastore.v1.EntityProto
-            .internal_static_google_datastore_v1_Key_PathElement_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.google.datastore.v1.EntityProto
-            .internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable
+        return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.google.datastore.v1.Key.PathElement.class,
-                com.google.datastore.v1.Key.PathElement.Builder.class);
+                com.google.datastore.v1.Key.PathElement.class, com.google.datastore.v1.Key.PathElement.Builder.class);
       }
 
       // Construct using com.google.datastore.v1.Key.PathElement.newBuilder()
@@ -743,15 +694,16 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
-
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
       }
-
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -763,9 +715,9 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.datastore.v1.EntityProto
-            .internal_static_google_datastore_v1_Key_PathElement_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor;
       }
 
       @java.lang.Override
@@ -784,8 +736,7 @@ public com.google.datastore.v1.Key.PathElement build() {
 
       @java.lang.Override
       public com.google.datastore.v1.Key.PathElement buildPartial() {
-        com.google.datastore.v1.Key.PathElement result =
-            new com.google.datastore.v1.Key.PathElement(this);
+        com.google.datastore.v1.Key.PathElement result = new com.google.datastore.v1.Key.PathElement(this);
         result.kind_ = kind_;
         if (idTypeCase_ == 2) {
           result.idType_ = idType_;
@@ -802,41 +753,38 @@ public com.google.datastore.v1.Key.PathElement buildPartial() {
       public Builder clone() {
         return super.clone();
       }
-
       @java.lang.Override
       public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
-
       @java.lang.Override
-      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
-
       @java.lang.Override
-      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
-
       @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
-
       @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
-
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.datastore.v1.Key.PathElement) {
-          return mergeFrom((com.google.datastore.v1.Key.PathElement) other);
+          return mergeFrom((com.google.datastore.v1.Key.PathElement)other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -850,22 +798,19 @@ public Builder mergeFrom(com.google.datastore.v1.Key.PathElement other) {
           onChanged();
         }
         switch (other.getIdTypeCase()) {
-          case ID:
-            {
-              setId(other.getId());
-              break;
-            }
-          case NAME:
-            {
-              idTypeCase_ = 3;
-              idType_ = other.idType_;
-              onChanged();
-              break;
-            }
-          case IDTYPE_NOT_SET:
-            {
-              break;
-            }
+          case ID: {
+            setId(other.getId());
+            break;
+          }
+          case NAME: {
+            idTypeCase_ = 3;
+            idType_ = other.idType_;
+            onChanged();
+            break;
+          }
+          case IDTYPE_NOT_SET: {
+            break;
+          }
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -895,12 +840,12 @@ public Builder mergeFrom(
         }
         return this;
       }
-
       private int idTypeCase_ = 0;
       private java.lang.Object idType_;
-
-      public IdTypeCase getIdTypeCase() {
-        return IdTypeCase.forNumber(idTypeCase_);
+      public IdTypeCase
+          getIdTypeCase() {
+        return IdTypeCase.forNumber(
+            idTypeCase_);
       }
 
       public Builder clearIdType() {
@@ -910,10 +855,9 @@ public Builder clearIdType() {
         return this;
       }
 
+
       private java.lang.Object kind_ = "";
       /**
-       *
-       *
        * 
        * The kind of the entity.
        * A kind matching regex `__.*__` is reserved/read-only.
@@ -922,13 +866,13 @@ public Builder clearIdType() {
        * 

        *
        * string kind = 1;
-       *
        * @return The kind.
        */
       public java.lang.String getKind() {
         java.lang.Object ref = kind_;
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           kind_ = s;
           return s;
@@ -937,8 +881,6 @@ public java.lang.String getKind() {
         }
       }
       /**
-       *
-       *
        * 
        * The kind of the entity.
        * A kind matching regex `__.*__` is reserved/read-only.
@@ -947,14 +889,15 @@ public java.lang.String getKind() {
        * 

        *
        * string kind = 1;
-       *
        * @return The bytes for kind.
        */
-      public com.google.protobuf.ByteString getKindBytes() {
+      public com.google.protobuf.ByteString
+          getKindBytes() {
         java.lang.Object ref = kind_;
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           kind_ = b;
           return b;
         } else {
@@ -962,8 +905,6 @@ public com.google.protobuf.ByteString getKindBytes() {
         }
       }
       /**
-       *
-       *
        * 
        * The kind of the entity.
        * A kind matching regex `__.*__` is reserved/read-only.
@@ -972,22 +913,20 @@ public com.google.protobuf.ByteString getKindBytes() {
        * 

        *
        * string kind = 1;
-       *
        * @param value The kind to set.
        * @return This builder for chaining.
        */
-      public Builder setKind(java.lang.String value) {
+      public Builder setKind(
+          java.lang.String value) {
         if (value == null) {
-          throw new NullPointerException();
-        }
-
+    throw new NullPointerException();
+  }
+  
         kind_ = value;
         onChanged();
         return this;
       }
       /**
-       *
-       *
        * 
        * The kind of the entity.
        * A kind matching regex `__.*__` is reserved/read-only.
@@ -996,18 +935,15 @@ public Builder setKind(java.lang.String value) {
        * 

        *
        * string kind = 1;
-       *
        * @return This builder for chaining.
        */
       public Builder clearKind() {
-
+        
         kind_ = getDefaultInstance().getKind();
         onChanged();
         return this;
       }
       /**
-       *
-       *
        * 
        * The kind of the entity.
        * A kind matching regex `__.*__` is reserved/read-only.
@@ -1016,24 +952,22 @@ public Builder clearKind() {
        * 

        *
        * string kind = 1;
-       *
        * @param value The bytes for kind to set.
        * @return This builder for chaining.
        */
-      public Builder setKindBytes(com.google.protobuf.ByteString value) {
+      public Builder setKindBytes(
+          com.google.protobuf.ByteString value) {
         if (value == null) {
-          throw new NullPointerException();
-        }
-        checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
         kind_ = value;
         onChanged();
         return this;
       }
 
       /**
-       *
-       *
        * 
        * The auto-allocated ID of the entity.
        * Never equal to zero. Values less than zero are discouraged and may not
@@ -1041,7 +975,6 @@ public Builder setKindBytes(com.google.protobuf.ByteString value) {
        * 

        *
        * int64 id = 2;
-       *
        * @return The id.
        */
       public long getId() {
@@ -1051,8 +984,6 @@ public long getId() {
         return 0L;
       }
       /**
-       *
-       *
        * 
        * The auto-allocated ID of the entity.
        * Never equal to zero. Values less than zero are discouraged and may not
@@ -1060,7 +991,6 @@ public long getId() {
        * 

        *
        * int64 id = 2;
-       *
        * @param value The id to set.
        * @return This builder for chaining.
        */
@@ -1071,8 +1001,6 @@ public Builder setId(long value) {
         return this;
       }
       /**
-       *
-       *
        * 
        * The auto-allocated ID of the entity.
        * Never equal to zero. Values less than zero are discouraged and may not
@@ -1080,7 +1008,6 @@ public Builder setId(long value) {
        * 

        *
        * int64 id = 2;
-       *
        * @return This builder for chaining.
        */
       public Builder clearId() {
@@ -1093,8 +1020,6 @@ public Builder clearId() {
       }
 
       /**
-       *
-       *
        * 
        * The name of the entity.
        * A name matching regex `__.*__` is reserved/read-only.
@@ -1103,7 +1028,6 @@ public Builder clearId() {
        * 

        *
        * string name = 3;
-       *
        * @return The name.
        */
       public java.lang.String getName() {
@@ -1112,7 +1036,8 @@ public java.lang.String getName() {
           ref = idType_;
         }
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (idTypeCase_ == 3) {
             idType_ = s;
@@ -1123,8 +1048,6 @@ public java.lang.String getName() {
         }
       }
       /**
-       *
-       *
        * 
        * The name of the entity.
        * A name matching regex `__.*__` is reserved/read-only.
@@ -1133,17 +1056,18 @@ public java.lang.String getName() {
        * 

        *
        * string name = 3;
-       *
        * @return The bytes for name.
        */
-      public com.google.protobuf.ByteString getNameBytes() {
+      public com.google.protobuf.ByteString
+          getNameBytes() {
         java.lang.Object ref = "";
         if (idTypeCase_ == 3) {
           ref = idType_;
         }
         if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           if (idTypeCase_ == 3) {
             idType_ = b;
           }
@@ -1153,8 +1077,6 @@ public com.google.protobuf.ByteString getNameBytes() {
         }
       }
       /**
-       *
-       *
        * 
        * The name of the entity.
        * A name matching regex `__.*__` is reserved/read-only.
@@ -1163,22 +1085,20 @@ public com.google.protobuf.ByteString getNameBytes() {
        * 

        *
        * string name = 3;
-       *
        * @param value The name to set.
        * @return This builder for chaining.
        */
-      public Builder setName(java.lang.String value) {
+      public Builder setName(
+          java.lang.String value) {
         if (value == null) {
-          throw new NullPointerException();
-        }
-        idTypeCase_ = 3;
+    throw new NullPointerException();
+  }
+  idTypeCase_ = 3;
         idType_ = value;
         onChanged();
         return this;
       }
       /**
-       *
-       *
        * 
        * The name of the entity.
        * A name matching regex `__.*__` is reserved/read-only.
@@ -1187,7 +1107,6 @@ public Builder setName(java.lang.String value) {
        * 

        *
        * string name = 3;
-       *
        * @return This builder for chaining.
        */
       public Builder clearName() {
@@ -1199,8 +1118,6 @@ public Builder clearName() {
         return this;
       }
       /**
-       *
-       *
        * 
        * The name of the entity.
        * A name matching regex `__.*__` is reserved/read-only.
@@ -1209,21 +1126,20 @@ public Builder clearName() {
        * 

        *
        * string name = 3;
-       *
        * @param value The bytes for name to set.
        * @return This builder for chaining.
        */
-      public Builder setNameBytes(com.google.protobuf.ByteString value) {
+      public Builder setNameBytes(
+          com.google.protobuf.ByteString value) {
         if (value == null) {
-          throw new NullPointerException();
-        }
-        checkByteStringIsUtf8(value);
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
         idTypeCase_ = 3;
         idType_ = value;
         onChanged();
         return this;
       }
-
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1236,12 +1152,12 @@ public final Builder mergeUnknownFields(
         return super.mergeUnknownFields(unknownFields);
       }
 
+
       // @@protoc_insertion_point(builder_scope:google.datastore.v1.Key.PathElement)
     }
 
     // @@protoc_insertion_point(class_scope:google.datastore.v1.Key.PathElement)
     private static final com.google.datastore.v1.Key.PathElement DEFAULT_INSTANCE;
-
     static {
       DEFAULT_INSTANCE = new com.google.datastore.v1.Key.PathElement();
     }
@@ -1250,16 +1166,16 @@ public static com.google.datastore.v1.Key.PathElement getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser PARSER =
-        new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
-          public PathElement parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            return new PathElement(input, extensionRegistry);
-          }
-        };
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
+      @java.lang.Override
+      public PathElement parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PathElement(input, extensionRegistry);
+      }
+    };
 
     public static com.google.protobuf.Parser parser() {
       return PARSER;
@@ -1274,13 +1190,12 @@ public com.google.protobuf.Parser getParserForType() {
     public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
   public static final int PARTITION_ID_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PartitionId partitionId_;
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -1288,15 +1203,12 @@ public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 1;
-   *
    * @return Whether the partitionId field is set.
    */
   public boolean hasPartitionId() {
     return partitionId_ != null;
   }
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -1304,17 +1216,12 @@ public boolean hasPartitionId() {
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 1;
-   *
    * @return The partitionId.
    */
   public com.google.datastore.v1.PartitionId getPartitionId() {
-    return partitionId_ == null
-        ? com.google.datastore.v1.PartitionId.getDefaultInstance()
-        : partitionId_;
+    return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
   }
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -1330,8 +1237,6 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
   public static final int PATH_FIELD_NUMBER = 2;
   private java.util.List path_;
   /**
-   *
-   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -1355,8 +1260,6 @@ public java.util.List getPathList() {
     return path_;
   }
   /**
-   *
-   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -1376,13 +1279,11 @@ public java.util.List getPathList() {
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
-  public java.util.List
+  public java.util.List 
       getPathOrBuilderList() {
     return path_;
   }
   /**
-   *
-   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -1406,8 +1307,6 @@ public int getPathCount() {
     return path_.size();
   }
   /**
-   *
-   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -1431,8 +1330,6 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
     return path_.get(index);
   }
   /**
-   *
-   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -1452,12 +1349,12 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
-  public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int index) {
+  public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(
+      int index) {
     return path_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -1469,7 +1366,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (partitionId_ != null) {
       output.writeMessage(1, getPartitionId());
     }
@@ -1486,10 +1384,12 @@ public int getSerializedSize() {
 
     size = 0;
     if (partitionId_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getPartitionId());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getPartitionId());
     }
     for (int i = 0; i < path_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, path_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, path_.get(i));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -1499,7 +1399,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Key)) {
       return super.equals(obj);
@@ -1508,9 +1408,11 @@ public boolean equals(final java.lang.Object obj) {
 
     if (hasPartitionId() != other.hasPartitionId()) return false;
     if (hasPartitionId()) {
-      if (!getPartitionId().equals(other.getPartitionId())) return false;
+      if (!getPartitionId()
+          .equals(other.getPartitionId())) return false;
     }
-    if (!getPathList().equals(other.getPathList())) return false;
+    if (!getPathList()
+        .equals(other.getPathList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -1535,103 +1437,97 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Key parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Key parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Key parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Key parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.Key parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Key parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Key parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Key parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Key parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Key parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Key parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Key parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Key parseFrom(com.google.protobuf.CodedInputStream input)
+  public static com.google.datastore.v1.Key parseFrom(
+      com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Key parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.Key prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A unique identifier for an entity.
    * If a key's partition ID or any of its path kinds or names are
@@ -1641,19 +1537,19 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * Protobuf type {@code google.datastore.v1.Key}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Key)
       com.google.datastore.v1.KeyOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_Key_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.google.datastore.v1.Key.class, com.google.datastore.v1.Key.Builder.class);
     }
@@ -1663,17 +1559,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getPathFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -1693,7 +1589,8 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor;
     }
 
@@ -1737,39 +1634,38 @@ public com.google.datastore.v1.Key buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Key) {
-        return mergeFrom((com.google.datastore.v1.Key) other);
+        return mergeFrom((com.google.datastore.v1.Key)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -1799,10 +1695,9 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) {
             pathBuilder_ = null;
             path_ = other.path_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            pathBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getPathFieldBuilder()
-                    : null;
+            pathBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getPathFieldBuilder() : null;
           } else {
             pathBuilder_.addAllMessages(other.path_);
           }
@@ -1836,18 +1731,12 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
     private com.google.datastore.v1.PartitionId partitionId_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PartitionId,
-            com.google.datastore.v1.PartitionId.Builder,
-            com.google.datastore.v1.PartitionIdOrBuilder>
-        partitionIdBuilder_;
+        com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> partitionIdBuilder_;
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1855,15 +1744,12 @@ public Builder mergeFrom(
      * 

      *
      * .google.datastore.v1.PartitionId partition_id = 1;
-     *
      * @return Whether the partitionId field is set.
      */
     public boolean hasPartitionId() {
       return partitionIdBuilder_ != null || partitionId_ != null;
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1871,21 +1757,16 @@ public boolean hasPartitionId() {
      * 

      *
      * .google.datastore.v1.PartitionId partition_id = 1;
-     *
      * @return The partitionId.
      */
     public com.google.datastore.v1.PartitionId getPartitionId() {
       if (partitionIdBuilder_ == null) {
-        return partitionId_ == null
-            ? com.google.datastore.v1.PartitionId.getDefaultInstance()
-            : partitionId_;
+        return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
       } else {
         return partitionIdBuilder_.getMessage();
       }
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1908,8 +1789,6 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1918,7 +1797,8 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
      *
      * .google.datastore.v1.PartitionId partition_id = 1;
      */
-    public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builderForValue) {
+    public Builder setPartitionId(
+        com.google.datastore.v1.PartitionId.Builder builderForValue) {
       if (partitionIdBuilder_ == null) {
         partitionId_ = builderForValue.build();
         onChanged();
@@ -1929,8 +1809,6 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builde
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1943,9 +1821,7 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       if (partitionIdBuilder_ == null) {
         if (partitionId_ != null) {
           partitionId_ =
-              com.google.datastore.v1.PartitionId.newBuilder(partitionId_)
-                  .mergeFrom(value)
-                  .buildPartial();
+            com.google.datastore.v1.PartitionId.newBuilder(partitionId_).mergeFrom(value).buildPartial();
         } else {
           partitionId_ = value;
         }
@@ -1957,8 +1833,6 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1979,8 +1853,6 @@ public Builder clearPartitionId() {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -1990,13 +1862,11 @@ public Builder clearPartitionId() {
      * .google.datastore.v1.PartitionId partition_id = 1;
      */
     public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() {
-
+      
       onChanged();
       return getPartitionIdFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -2009,14 +1879,11 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
       if (partitionIdBuilder_ != null) {
         return partitionIdBuilder_.getMessageOrBuilder();
       } else {
-        return partitionId_ == null
-            ? com.google.datastore.v1.PartitionId.getDefaultInstance()
-            : partitionId_;
+        return partitionId_ == null ?
+            com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
       }
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, currently identified by a project
      * ID and namespace ID.
@@ -2026,41 +1893,32 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
      * .google.datastore.v1.PartitionId partition_id = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PartitionId,
-            com.google.datastore.v1.PartitionId.Builder,
-            com.google.datastore.v1.PartitionIdOrBuilder>
+        com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> 
         getPartitionIdFieldBuilder() {
       if (partitionIdBuilder_ == null) {
-        partitionIdBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.PartitionId,
-                com.google.datastore.v1.PartitionId.Builder,
-                com.google.datastore.v1.PartitionIdOrBuilder>(
-                getPartitionId(), getParentForChildren(), isClean());
+        partitionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder>(
+                getPartitionId(),
+                getParentForChildren(),
+                isClean());
         partitionId_ = null;
       }
       return partitionIdBuilder_;
     }
 
     private java.util.List path_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensurePathIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
         path_ = new java.util.ArrayList(path_);
         bitField0_ |= 0x00000001;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key.PathElement,
-            com.google.datastore.v1.Key.PathElement.Builder,
-            com.google.datastore.v1.Key.PathElementOrBuilder>
-        pathBuilder_;
+        com.google.datastore.v1.Key.PathElement, com.google.datastore.v1.Key.PathElement.Builder, com.google.datastore.v1.Key.PathElementOrBuilder> pathBuilder_;
 
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2088,8 +1946,6 @@ public java.util.List getPathList() {
       }
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2117,8 +1973,6 @@ public int getPathCount() {
       }
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2146,8 +2000,6 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2167,7 +2019,8 @@ public com.google.datastore.v1.Key.PathElement getPath(int index) {
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public Builder setPath(int index, com.google.datastore.v1.Key.PathElement value) {
+    public Builder setPath(
+        int index, com.google.datastore.v1.Key.PathElement value) {
       if (pathBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2181,8 +2034,6 @@ public Builder setPath(int index, com.google.datastore.v1.Key.PathElement value)
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2214,8 +2065,6 @@ public Builder setPath(
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2249,8 +2098,6 @@ public Builder addPath(com.google.datastore.v1.Key.PathElement value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2270,7 +2117,8 @@ public Builder addPath(com.google.datastore.v1.Key.PathElement value) {
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public Builder addPath(int index, com.google.datastore.v1.Key.PathElement value) {
+    public Builder addPath(
+        int index, com.google.datastore.v1.Key.PathElement value) {
       if (pathBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2284,8 +2132,6 @@ public Builder addPath(int index, com.google.datastore.v1.Key.PathElement value)
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2305,7 +2151,8 @@ public Builder addPath(int index, com.google.datastore.v1.Key.PathElement value)
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public Builder addPath(com.google.datastore.v1.Key.PathElement.Builder builderForValue) {
+    public Builder addPath(
+        com.google.datastore.v1.Key.PathElement.Builder builderForValue) {
       if (pathBuilder_ == null) {
         ensurePathIsMutable();
         path_.add(builderForValue.build());
@@ -2316,8 +2163,6 @@ public Builder addPath(com.google.datastore.v1.Key.PathElement.Builder builderFo
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2349,8 +2194,6 @@ public Builder addPath(
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2374,7 +2217,8 @@ public Builder addAllPath(
         java.lang.Iterable values) {
       if (pathBuilder_ == null) {
         ensurePathIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, path_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, path_);
         onChanged();
       } else {
         pathBuilder_.addAllMessages(values);
@@ -2382,8 +2226,6 @@ public Builder addAllPath(
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2414,8 +2256,6 @@ public Builder clearPath() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2446,8 +2286,6 @@ public Builder removePath(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2467,12 +2305,11 @@ public Builder removePath(int index) {
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public com.google.datastore.v1.Key.PathElement.Builder getPathBuilder(int index) {
+    public com.google.datastore.v1.Key.PathElement.Builder getPathBuilder(
+        int index) {
       return getPathFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2492,16 +2329,14 @@ public com.google.datastore.v1.Key.PathElement.Builder getPathBuilder(int index)
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int index) {
+    public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(
+        int index) {
       if (pathBuilder_ == null) {
-        return path_.get(index);
-      } else {
+        return path_.get(index);  } else {
         return pathBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2521,8 +2356,8 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int ind
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public java.util.List
-        getPathOrBuilderList() {
+    public java.util.List 
+         getPathOrBuilderList() {
       if (pathBuilder_ != null) {
         return pathBuilder_.getMessageOrBuilderList();
       } else {
@@ -2530,8 +2365,6 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int ind
       }
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2552,12 +2385,10 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int ind
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
     public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder() {
-      return getPathFieldBuilder()
-          .addBuilder(com.google.datastore.v1.Key.PathElement.getDefaultInstance());
+      return getPathFieldBuilder().addBuilder(
+          com.google.datastore.v1.Key.PathElement.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2577,13 +2408,12 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder() {
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder(int index) {
-      return getPathFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.Key.PathElement.getDefaultInstance());
+    public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder(
+        int index) {
+      return getPathFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.Key.PathElement.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The entity path.
      * An entity path consists of one or more elements composed of a kind and a
@@ -2603,29 +2433,27 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder(int index)
      *
      * repeated .google.datastore.v1.Key.PathElement path = 2;
      */
-    public java.util.List getPathBuilderList() {
+    public java.util.List 
+         getPathBuilderList() {
       return getPathFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key.PathElement,
-            com.google.datastore.v1.Key.PathElement.Builder,
-            com.google.datastore.v1.Key.PathElementOrBuilder>
+        com.google.datastore.v1.Key.PathElement, com.google.datastore.v1.Key.PathElement.Builder, com.google.datastore.v1.Key.PathElementOrBuilder> 
         getPathFieldBuilder() {
       if (pathBuilder_ == null) {
-        pathBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.Key.PathElement,
-                com.google.datastore.v1.Key.PathElement.Builder,
-                com.google.datastore.v1.Key.PathElementOrBuilder>(
-                path_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        pathBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.Key.PathElement, com.google.datastore.v1.Key.PathElement.Builder, com.google.datastore.v1.Key.PathElementOrBuilder>(
+                path_,
+                ((bitField0_ & 0x00000001) != 0),
+                getParentForChildren(),
+                isClean());
         path_ = null;
       }
       return pathBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -2635,12 +2463,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Key)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Key)
   private static final com.google.datastore.v1.Key DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Key();
   }
@@ -2649,16 +2477,16 @@ public static com.google.datastore.v1.Key getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public Key parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Key(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public Key parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Key(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -2673,4 +2501,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Key getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java
index d18a916e6..70fbf868e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KeyOrBuilder.java
@@ -18,14 +18,11 @@
 
 package com.google.datastore.v1;
 
-public interface KeyOrBuilder
-    extends
+public interface KeyOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Key)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -33,13 +30,10 @@ public interface KeyOrBuilder
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 1;
-   *
    * @return Whether the partitionId field is set.
    */
   boolean hasPartitionId();
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -47,13 +41,10 @@ public interface KeyOrBuilder
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 1;
-   *
    * @return The partitionId.
    */
   com.google.datastore.v1.PartitionId getPartitionId();
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, currently identified by a project
    * ID and namespace ID.
@@ -65,8 +56,6 @@ public interface KeyOrBuilder
   com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder();
 
   /**
-   *
-   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -86,10 +75,9 @@ public interface KeyOrBuilder
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
-  java.util.List getPathList();
+  java.util.List 
+      getPathList();
   /**
-   *
-   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -111,8 +99,6 @@ public interface KeyOrBuilder
    */
   com.google.datastore.v1.Key.PathElement getPath(int index);
   /**
-   *
-   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -134,8 +120,6 @@ public interface KeyOrBuilder
    */
   int getPathCount();
   /**
-   *
-   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -155,10 +139,9 @@ public interface KeyOrBuilder
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
-  java.util.List getPathOrBuilderList();
+  java.util.List 
+      getPathOrBuilderList();
   /**
-   *
-   *
    * 
    * The entity path.
    * An entity path consists of one or more elements composed of a kind and a
@@ -178,5 +161,6 @@ public interface KeyOrBuilder
    *
    * repeated .google.datastore.v1.Key.PathElement path = 2;
    */
-  com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(int index);
+  com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(
+      int index);
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java
index c1398f488..e275b5e3c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java
@@ -19,39 +19,37 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A representation of a kind.
  * 

  *
  * Protobuf type {@code google.datastore.v1.KindExpression}
  */
-public final class KindExpression extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class KindExpression extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.KindExpression)
     KindExpressionOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use KindExpression.newBuilder() to construct.
   private KindExpression(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private KindExpression() {
     name_ = "";
   }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new KindExpression();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private KindExpression(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -70,58 +68,52 @@ private KindExpression(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              name_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            name_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_KindExpression_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_KindExpression_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.KindExpression.class,
-            com.google.datastore.v1.KindExpression.Builder.class);
+            com.google.datastore.v1.KindExpression.class, com.google.datastore.v1.KindExpression.Builder.class);
   }
 
   public static final int NAME_FIELD_NUMBER = 1;
   private volatile java.lang.Object name_;
   /**
-   *
-   *
    * 
    * The name of the kind.
    * 

    *
    * string name = 1;
-   *
    * @return The name.
    */
   public java.lang.String getName() {
@@ -129,28 +121,28 @@ public java.lang.String getName() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       name_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * The name of the kind.
    * 

    *
    * string name = 1;
-   *
    * @return The bytes for name.
    */
-  public com.google.protobuf.ByteString getNameBytes() {
+  public com.google.protobuf.ByteString
+      getNameBytes() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       name_ = b;
       return b;
     } else {
@@ -159,7 +151,6 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -171,7 +162,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
@@ -195,14 +187,15 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.KindExpression)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.KindExpression other = (com.google.datastore.v1.KindExpression) obj;
 
-    if (!getName().equals(other.getName())) return false;
+    if (!getName()
+        .equals(other.getName())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -221,127 +214,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.KindExpression parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.KindExpression parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.KindExpression parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.KindExpression parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.KindExpression parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.KindExpression parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.KindExpression parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.KindExpression parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.KindExpression parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.KindExpression parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.KindExpression parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.KindExpression parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.KindExpression parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.KindExpression prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A representation of a kind.
    * 

    *
    * Protobuf type {@code google.datastore.v1.KindExpression}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.KindExpression)
       com.google.datastore.v1.KindExpressionOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_KindExpression_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_KindExpression_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.KindExpression.class,
-              com.google.datastore.v1.KindExpression.Builder.class);
+              com.google.datastore.v1.KindExpression.class, com.google.datastore.v1.KindExpression.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.KindExpression.newBuilder()
@@ -349,15 +333,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -367,9 +352,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_KindExpression_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor;
     }
 
     @java.lang.Override
@@ -388,8 +373,7 @@ public com.google.datastore.v1.KindExpression build() {
 
     @java.lang.Override
     public com.google.datastore.v1.KindExpression buildPartial() {
-      com.google.datastore.v1.KindExpression result =
-          new com.google.datastore.v1.KindExpression(this);
+      com.google.datastore.v1.KindExpression result = new com.google.datastore.v1.KindExpression(this);
       result.name_ = name_;
       onBuilt();
       return result;
@@ -399,39 +383,38 @@ public com.google.datastore.v1.KindExpression buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.KindExpression) {
-        return mergeFrom((com.google.datastore.v1.KindExpression) other);
+        return mergeFrom((com.google.datastore.v1.KindExpression)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -475,20 +458,18 @@ public Builder mergeFrom(
 
     private java.lang.Object name_ = "";
     /**
-     *
-     *
      * 
      * The name of the kind.
      * 

      *
      * string name = 1;
-     *
      * @return The name.
      */
     public java.lang.String getName() {
       java.lang.Object ref = name_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         name_ = s;
         return s;
@@ -497,21 +478,20 @@ public java.lang.String getName() {
       }
     }
     /**
-     *
-     *
      * 
      * The name of the kind.
      * 

      *
      * string name = 1;
-     *
      * @return The bytes for name.
      */
-    public com.google.protobuf.ByteString getNameBytes() {
+    public com.google.protobuf.ByteString
+        getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         name_ = b;
         return b;
       } else {
@@ -519,68 +499,61 @@ public com.google.protobuf.ByteString getNameBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * The name of the kind.
      * 

      *
      * string name = 1;
-     *
      * @param value The name to set.
      * @return This builder for chaining.
      */
-    public Builder setName(java.lang.String value) {
+    public Builder setName(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       name_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The name of the kind.
      * 

      *
      * string name = 1;
-     *
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
+      
       name_ = getDefaultInstance().getName();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The name of the kind.
      * 

      *
      * string name = 1;
-     *
      * @param value The bytes for name to set.
      * @return This builder for chaining.
      */
-    public Builder setNameBytes(com.google.protobuf.ByteString value) {
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       name_ = value;
       onChanged();
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -590,12 +563,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.KindExpression)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.KindExpression)
   private static final com.google.datastore.v1.KindExpression DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.KindExpression();
   }
@@ -604,16 +577,16 @@ public static com.google.datastore.v1.KindExpression getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public KindExpression parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new KindExpression(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public KindExpression parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new KindExpression(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -628,4 +601,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.KindExpression getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
index fed52258e..fe1685e04 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpressionOrBuilder.java
@@ -18,33 +18,27 @@
 
 package com.google.datastore.v1;
 
-public interface KindExpressionOrBuilder
-    extends
+public interface KindExpressionOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.KindExpression)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The name of the kind.
    * 

    *
    * string name = 1;
-   *
    * @return The name.
    */
   java.lang.String getName();
   /**
-   *
-   *
    * 
    * The name of the kind.
    * 

    *
    * string name = 1;
-   *
    * @return The bytes for name.
    */
-  com.google.protobuf.ByteString getNameBytes();
+  com.google.protobuf.ByteString
+      getNameBytes();
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java
index ae6477000..2e516aad3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java
@@ -19,24 +19,21 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The request for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
  * 

  *
  * Protobuf type {@code google.datastore.v1.LookupRequest}
  */
-public final class LookupRequest extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class LookupRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.LookupRequest)
     LookupRequestOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use LookupRequest.newBuilder() to construct.
   private LookupRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private LookupRequest() {
     projectId_ = "";
     keys_ = java.util.Collections.emptyList();
@@ -44,15 +41,16 @@ private LookupRequest() {
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new LookupRequest();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private LookupRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -72,51 +70,48 @@ private LookupRequest(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
-              if (readOptions_ != null) {
-                subBuilder = readOptions_.toBuilder();
-              }
-              readOptions_ =
-                  input.readMessage(
-                      com.google.datastore.v1.ReadOptions.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(readOptions_);
-                readOptions_ = subBuilder.buildPartial();
-              }
-
-              break;
+          case 10: {
+            com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
+            if (readOptions_ != null) {
+              subBuilder = readOptions_.toBuilder();
             }
-          case 26:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                keys_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-              break;
+            readOptions_ = input.readMessage(com.google.datastore.v1.ReadOptions.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(readOptions_);
+              readOptions_ = subBuilder.buildPartial();
             }
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              projectId_ = s;
-              break;
+            break;
+          }
+          case 26: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              keys_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            keys_.add(
+                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
+            break;
+          }
+          case 66: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            projectId_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) != 0)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
@@ -125,33 +120,27 @@ private LookupRequest(
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_LookupRequest_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.LookupRequest.class,
-            com.google.datastore.v1.LookupRequest.Builder.class);
+            com.google.datastore.v1.LookupRequest.class, com.google.datastore.v1.LookupRequest.Builder.class);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   public java.lang.String getProjectId() {
@@ -159,28 +148,28 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  public com.google.protobuf.ByteString getProjectIdBytes() {
+  public com.google.protobuf.ByteString
+      getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -191,38 +180,28 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   public static final int READ_OPTIONS_FIELD_NUMBER = 1;
   private com.google.datastore.v1.ReadOptions readOptions_;
   /**
-   *
-   *
    * 
    * The options for this lookup request.
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
-   *
    * @return Whether the readOptions field is set.
    */
   public boolean hasReadOptions() {
     return readOptions_ != null;
   }
   /**
-   *
-   *
    * 
    * The options for this lookup request.
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
-   *
    * @return The readOptions.
    */
   public com.google.datastore.v1.ReadOptions getReadOptions() {
-    return readOptions_ == null
-        ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
-        : readOptions_;
+    return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
   }
   /**
-   *
-   *
    * 
    * The options for this lookup request.
    * 

@@ -236,73 +215,59 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
   public static final int KEYS_FIELD_NUMBER = 3;
   private java.util.List keys_;
   /**
-   *
-   *
    * 
    * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    */
   public java.util.List getKeysList() {
     return keys_;
   }
   /**
-   *
-   *
    * 
    * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    */
-  public java.util.List getKeysOrBuilderList() {
+  public java.util.List 
+      getKeysOrBuilderList() {
     return keys_;
   }
   /**
-   *
-   *
    * 
    * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    */
   public int getKeysCount() {
     return keys_.size();
   }
   /**
-   *
-   *
    * 
    * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    */
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
   /**
-   *
-   *
    * 
    * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    */
-  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
+  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
+      int index) {
     return keys_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -314,7 +279,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (readOptions_ != null) {
       output.writeMessage(1, getReadOptions());
     }
@@ -334,10 +300,12 @@ public int getSerializedSize() {
 
     size = 0;
     if (readOptions_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadOptions());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getReadOptions());
     }
     for (int i = 0; i < keys_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, keys_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, keys_.get(i));
     }
     if (!getProjectIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
@@ -350,19 +318,22 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.LookupRequest)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.LookupRequest other = (com.google.datastore.v1.LookupRequest) obj;
 
-    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getProjectId()
+        .equals(other.getProjectId())) return false;
     if (hasReadOptions() != other.hasReadOptions()) return false;
     if (hasReadOptions()) {
-      if (!getReadOptions().equals(other.getReadOptions())) return false;
+      if (!getReadOptions()
+          .equals(other.getReadOptions())) return false;
     }
-    if (!getKeysList().equals(other.getKeysList())) return false;
+    if (!getKeysList()
+        .equals(other.getKeysList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -389,126 +360,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.LookupRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.LookupRequest parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.LookupRequest parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.LookupRequest parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.LookupRequest parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.LookupRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.LookupRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.LookupRequest parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.LookupRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.LookupRequest parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.LookupRequest parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.LookupRequest parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.LookupRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.LookupRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.LookupRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The request for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
    * 

    *
    * Protobuf type {@code google.datastore.v1.LookupRequest}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.LookupRequest)
       com.google.datastore.v1.LookupRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_LookupRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.LookupRequest.class,
-              com.google.datastore.v1.LookupRequest.Builder.class);
+              com.google.datastore.v1.LookupRequest.class, com.google.datastore.v1.LookupRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.LookupRequest.newBuilder()
@@ -516,17 +479,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getKeysFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -548,9 +511,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_LookupRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor;
     }
 
     @java.lang.Override
@@ -569,8 +532,7 @@ public com.google.datastore.v1.LookupRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.LookupRequest buildPartial() {
-      com.google.datastore.v1.LookupRequest result =
-          new com.google.datastore.v1.LookupRequest(this);
+      com.google.datastore.v1.LookupRequest result = new com.google.datastore.v1.LookupRequest(this);
       int from_bitField0_ = bitField0_;
       result.projectId_ = projectId_;
       if (readOptionsBuilder_ == null) {
@@ -595,39 +557,38 @@ public com.google.datastore.v1.LookupRequest buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.LookupRequest) {
-        return mergeFrom((com.google.datastore.v1.LookupRequest) other);
+        return mergeFrom((com.google.datastore.v1.LookupRequest)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -661,10 +622,9 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
             keysBuilder_ = null;
             keys_ = other.keys_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            keysBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getKeysFieldBuilder()
-                    : null;
+            keysBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getKeysFieldBuilder() : null;
           } else {
             keysBuilder_.addAllMessages(other.keys_);
           }
@@ -698,25 +658,22 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -725,21 +682,20 @@ public java.lang.String getProjectId() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The bytes for projectId.
      */
-    public com.google.protobuf.ByteString getProjectIdBytes() {
+    public com.google.protobuf.ByteString
+        getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -747,61 +703,54 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectId(java.lang.String value) {
+    public Builder setProjectId(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
+      
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The bytes for projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       projectId_ = value;
       onChanged();
       return this;
@@ -809,47 +758,34 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
 
     private com.google.datastore.v1.ReadOptions readOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ReadOptions,
-            com.google.datastore.v1.ReadOptions.Builder,
-            com.google.datastore.v1.ReadOptionsOrBuilder>
-        readOptionsBuilder_;
+        com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> readOptionsBuilder_;
     /**
-     *
-     *
      * 
      * The options for this lookup request.
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
-     *
      * @return Whether the readOptions field is set.
      */
     public boolean hasReadOptions() {
       return readOptionsBuilder_ != null || readOptions_ != null;
     }
     /**
-     *
-     *
      * 
      * The options for this lookup request.
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
-     *
      * @return The readOptions.
      */
     public com.google.datastore.v1.ReadOptions getReadOptions() {
       if (readOptionsBuilder_ == null) {
-        return readOptions_ == null
-            ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
-            : readOptions_;
+        return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
       } else {
         return readOptionsBuilder_.getMessage();
       }
     }
     /**
-     *
-     *
      * 
      * The options for this lookup request.
      * 

@@ -870,15 +806,14 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The options for this lookup request.
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
-    public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builderForValue) {
+    public Builder setReadOptions(
+        com.google.datastore.v1.ReadOptions.Builder builderForValue) {
       if (readOptionsBuilder_ == null) {
         readOptions_ = builderForValue.build();
         onChanged();
@@ -889,8 +824,6 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builde
       return this;
     }
     /**
-     *
-     *
      * 
      * The options for this lookup request.
      * 

@@ -901,9 +834,7 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       if (readOptionsBuilder_ == null) {
         if (readOptions_ != null) {
           readOptions_ =
-              com.google.datastore.v1.ReadOptions.newBuilder(readOptions_)
-                  .mergeFrom(value)
-                  .buildPartial();
+            com.google.datastore.v1.ReadOptions.newBuilder(readOptions_).mergeFrom(value).buildPartial();
         } else {
           readOptions_ = value;
         }
@@ -915,8 +846,6 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The options for this lookup request.
      * 

@@ -935,8 +864,6 @@ public Builder clearReadOptions() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The options for this lookup request.
      * 

@@ -944,13 +871,11 @@ public Builder clearReadOptions() {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() {
-
+      
       onChanged();
       return getReadOptionsFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The options for this lookup request.
      * 

@@ -961,14 +886,11 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
       if (readOptionsBuilder_ != null) {
         return readOptionsBuilder_.getMessageOrBuilder();
       } else {
-        return readOptions_ == null
-            ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
-            : readOptions_;
+        return readOptions_ == null ?
+            com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
       }
     }
     /**
-     *
-     *
      * 
      * The options for this lookup request.
      * 

@@ -976,46 +898,37 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ReadOptions,
-            com.google.datastore.v1.ReadOptions.Builder,
-            com.google.datastore.v1.ReadOptionsOrBuilder>
+        com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> 
         getReadOptionsFieldBuilder() {
       if (readOptionsBuilder_ == null) {
-        readOptionsBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.ReadOptions,
-                com.google.datastore.v1.ReadOptions.Builder,
-                com.google.datastore.v1.ReadOptionsOrBuilder>(
-                getReadOptions(), getParentForChildren(), isClean());
+        readOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder>(
+                getReadOptions(),
+                getParentForChildren(),
+                isClean());
         readOptions_ = null;
       }
       return readOptionsBuilder_;
     }
 
-    private java.util.List keys_ = java.util.Collections.emptyList();
-
+    private java.util.List keys_ =
+      java.util.Collections.emptyList();
     private void ensureKeysIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
         bitField0_ |= 0x00000001;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
-        keysBuilder_;
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_;
 
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
     public java.util.List getKeysList() {
       if (keysBuilder_ == null) {
@@ -1025,14 +938,11 @@ public java.util.List getKeysList() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
     public int getKeysCount() {
       if (keysBuilder_ == null) {
@@ -1042,14 +952,11 @@ public int getKeysCount() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
     public com.google.datastore.v1.Key getKeys(int index) {
       if (keysBuilder_ == null) {
@@ -1059,16 +966,14 @@ public com.google.datastore.v1.Key getKeys(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder setKeys(int index, com.google.datastore.v1.Key value) {
+    public Builder setKeys(
+        int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1082,16 +987,14 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKeys(
+        int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.set(index, builderForValue.build());
@@ -1102,14 +1005,11 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
     public Builder addKeys(com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
@@ -1125,16 +1025,14 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder addKeys(int index, com.google.datastore.v1.Key value) {
+    public Builder addKeys(
+        int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1148,16 +1046,14 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(
+        com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(builderForValue.build());
@@ -1168,16 +1064,14 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(
+        int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(index, builderForValue.build());
@@ -1188,19 +1082,18 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder addAllKeys(java.lang.Iterable values) {
+    public Builder addAllKeys(
+        java.lang.Iterable values) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, keys_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, keys_);
         onChanged();
       } else {
         keysBuilder_.addAllMessages(values);
@@ -1208,14 +1101,11 @@ public Builder addAllKeys(java.lang.Iterable
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
     public Builder clearKeys() {
       if (keysBuilder_ == null) {
@@ -1228,14 +1118,11 @@ public Builder clearKeys() {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
     public Builder removeKeys(int index) {
       if (keysBuilder_ == null) {
@@ -1248,46 +1135,39 @@ public Builder removeKeys(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
-    public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
+    public com.google.datastore.v1.Key.Builder getKeysBuilder(
+        int index) {
       return getKeysFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
-    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
+    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
+        int index) {
       if (keysBuilder_ == null) {
-        return keys_.get(index);
-      } else {
+        return keys_.get(index);  } else {
         return keysBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
-    public java.util.List getKeysOrBuilderList() {
+    public java.util.List 
+         getKeysOrBuilderList() {
       if (keysBuilder_ != null) {
         return keysBuilder_.getMessageOrBuilderList();
       } else {
@@ -1295,65 +1175,56 @@ public java.util.List getKeysOrB
       }
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
-      return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
+      return getKeysFieldBuilder().addBuilder(
+          com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
-    public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
-      return getKeysFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
+    public com.google.datastore.v1.Key.Builder addKeysBuilder(
+        int index) {
+      return getKeysFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Required. Keys of entities to look up.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
      */
-    public java.util.List getKeysBuilderList() {
+    public java.util.List 
+         getKeysBuilderList() {
       return getKeysFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
         getKeysFieldBuilder() {
       if (keysBuilder_ == null) {
-        keysBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.Key,
-                com.google.datastore.v1.Key.Builder,
-                com.google.datastore.v1.KeyOrBuilder>(
-                keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+                keys_,
+                ((bitField0_ & 0x00000001) != 0),
+                getParentForChildren(),
+                isClean());
         keys_ = null;
       }
       return keysBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1363,12 +1234,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.LookupRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.LookupRequest)
   private static final com.google.datastore.v1.LookupRequest DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.LookupRequest();
   }
@@ -1377,16 +1248,16 @@ public static com.google.datastore.v1.LookupRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public LookupRequest parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LookupRequest(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public LookupRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new LookupRequest(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1401,4 +1272,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java
index 887d95c0e..43cf2bf76 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java
@@ -18,63 +18,49 @@
 
 package com.google.datastore.v1;
 
-public interface LookupRequestOrBuilder
-    extends
+public interface LookupRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.LookupRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  com.google.protobuf.ByteString getProjectIdBytes();
+  com.google.protobuf.ByteString
+      getProjectIdBytes();
 
   /**
-   *
-   *
    * 
    * The options for this lookup request.
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
-   *
    * @return Whether the readOptions field is set.
    */
   boolean hasReadOptions();
   /**
-   *
-   *
    * 
    * The options for this lookup request.
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
-   *
    * @return The readOptions.
    */
   com.google.datastore.v1.ReadOptions getReadOptions();
   /**
-   *
-   *
    * 
    * The options for this lookup request.
    * 

@@ -84,58 +70,46 @@ public interface LookupRequestOrBuilder
   com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder();
 
   /**
-   *
-   *
    * 
    * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    */
-  java.util.List getKeysList();
+  java.util.List 
+      getKeysList();
   /**
-   *
-   *
    * 
    * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    */
   com.google.datastore.v1.Key getKeys(int index);
   /**
-   *
-   *
    * 
    * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    */
   int getKeysCount();
   /**
-   *
-   *
    * 
    * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    */
-  java.util.List getKeysOrBuilderList();
+  java.util.List 
+      getKeysOrBuilderList();
   /**
-   *
-   *
    * 
    * Required. Keys of entities to look up.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 3 [(.google.api.field_behavior) = REQUIRED];
    */
-  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index);
+  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
+      int index);
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java
index 7bf96d1cd..91326ead0 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java
@@ -19,24 +19,21 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The response for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
  * 

  *
  * Protobuf type {@code google.datastore.v1.LookupResponse}
  */
-public final class LookupResponse extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class LookupResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.LookupResponse)
     LookupResponseOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use LookupResponse.newBuilder() to construct.
   private LookupResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private LookupResponse() {
     found_ = java.util.Collections.emptyList();
     missing_ = java.util.Collections.emptyList();
@@ -45,15 +42,16 @@ private LookupResponse() {
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new LookupResponse();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private LookupResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -73,51 +71,47 @@ private LookupResponse(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                found_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              found_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
-              break;
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              found_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
             }
-          case 18:
-            {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                missing_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              missing_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
-              break;
+            found_.add(
+                input.readMessage(com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
+            break;
+          }
+          case 18: {
+            if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              missing_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000002;
             }
-          case 26:
-            {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                deferred_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              deferred_.add(
-                  input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-              break;
+            missing_.add(
+                input.readMessage(com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
+            break;
+          }
+          case 26: {
+            if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+              deferred_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000004;
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            deferred_.add(
+                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) != 0)) {
         found_ = java.util.Collections.unmodifiableList(found_);
@@ -132,27 +126,22 @@ private LookupResponse(
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_LookupResponse_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.LookupResponse.class,
-            com.google.datastore.v1.LookupResponse.Builder.class);
+            com.google.datastore.v1.LookupResponse.class, com.google.datastore.v1.LookupResponse.Builder.class);
   }
 
   public static final int FOUND_FIELD_NUMBER = 1;
   private java.util.List found_;
   /**
-   *
-   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -165,8 +154,6 @@ public java.util.List getFoundList() {
     return found_;
   }
   /**
-   *
-   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -175,13 +162,11 @@ public java.util.List getFoundList() {
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
-  public java.util.List
+  public java.util.List 
       getFoundOrBuilderList() {
     return found_;
   }
   /**
-   *
-   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -194,8 +179,6 @@ public int getFoundCount() {
     return found_.size();
   }
   /**
-   *
-   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -208,8 +191,6 @@ public com.google.datastore.v1.EntityResult getFound(int index) {
     return found_.get(index);
   }
   /**
-   *
-   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -218,15 +199,14 @@ public com.google.datastore.v1.EntityResult getFound(int index) {
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
-  public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index) {
+  public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
+      int index) {
     return found_.get(index);
   }
 
   public static final int MISSING_FIELD_NUMBER = 2;
   private java.util.List missing_;
   /**
-   *
-   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -239,8 +219,6 @@ public java.util.List getMissingList() {
     return missing_;
   }
   /**
-   *
-   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -249,13 +227,11 @@ public java.util.List getMissingList() {
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
-  public java.util.List
+  public java.util.List 
       getMissingOrBuilderList() {
     return missing_;
   }
   /**
-   *
-   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -268,8 +244,6 @@ public int getMissingCount() {
     return missing_.size();
   }
   /**
-   *
-   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -282,8 +256,6 @@ public com.google.datastore.v1.EntityResult getMissing(int index) {
     return missing_.get(index);
   }
   /**
-   *
-   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -292,15 +264,14 @@ public com.google.datastore.v1.EntityResult getMissing(int index) {
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
-  public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int index) {
+  public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
+      int index) {
     return missing_.get(index);
   }
 
   public static final int DEFERRED_FIELD_NUMBER = 3;
   private java.util.List deferred_;
   /**
-   *
-   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -313,8 +284,6 @@ public java.util.List getDeferredList() {
     return deferred_;
   }
   /**
-   *
-   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -323,12 +292,11 @@ public java.util.List getDeferredList() {
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
-  public java.util.List getDeferredOrBuilderList() {
+  public java.util.List 
+      getDeferredOrBuilderList() {
     return deferred_;
   }
   /**
-   *
-   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -341,8 +309,6 @@ public int getDeferredCount() {
     return deferred_.size();
   }
   /**
-   *
-   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -355,8 +321,6 @@ public com.google.datastore.v1.Key getDeferred(int index) {
     return deferred_.get(index);
   }
   /**
-   *
-   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -365,12 +329,12 @@ public com.google.datastore.v1.Key getDeferred(int index) {
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
-  public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
+  public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(
+      int index) {
     return deferred_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -382,7 +346,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     for (int i = 0; i < found_.size(); i++) {
       output.writeMessage(1, found_.get(i));
     }
@@ -402,13 +367,16 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < found_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, found_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, found_.get(i));
     }
     for (int i = 0; i < missing_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, missing_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, missing_.get(i));
     }
     for (int i = 0; i < deferred_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, deferred_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, deferred_.get(i));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -418,16 +386,19 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.LookupResponse)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.LookupResponse other = (com.google.datastore.v1.LookupResponse) obj;
 
-    if (!getFoundList().equals(other.getFoundList())) return false;
-    if (!getMissingList().equals(other.getMissingList())) return false;
-    if (!getDeferredList().equals(other.getDeferredList())) return false;
+    if (!getFoundList()
+        .equals(other.getFoundList())) return false;
+    if (!getMissingList()
+        .equals(other.getMissingList())) return false;
+    if (!getDeferredList()
+        .equals(other.getDeferredList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -456,127 +427,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.LookupResponse parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.LookupResponse parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.LookupResponse parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.LookupResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.LookupResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.LookupResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.LookupResponse parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.LookupResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.LookupResponse parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.LookupResponse parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.LookupResponse parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.LookupResponse parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.LookupResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.LookupResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The response for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup].
    * 

    *
    * Protobuf type {@code google.datastore.v1.LookupResponse}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.LookupResponse)
       com.google.datastore.v1.LookupResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_LookupResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.LookupResponse.class,
-              com.google.datastore.v1.LookupResponse.Builder.class);
+              com.google.datastore.v1.LookupResponse.class, com.google.datastore.v1.LookupResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.LookupResponse.newBuilder()
@@ -584,19 +546,19 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getFoundFieldBuilder();
         getMissingFieldBuilder();
         getDeferredFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -622,9 +584,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_LookupResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor;
     }
 
     @java.lang.Override
@@ -643,8 +605,7 @@ public com.google.datastore.v1.LookupResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.LookupResponse buildPartial() {
-      com.google.datastore.v1.LookupResponse result =
-          new com.google.datastore.v1.LookupResponse(this);
+      com.google.datastore.v1.LookupResponse result = new com.google.datastore.v1.LookupResponse(this);
       int from_bitField0_ = bitField0_;
       if (foundBuilder_ == null) {
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -681,39 +642,38 @@ public com.google.datastore.v1.LookupResponse buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.LookupResponse) {
-        return mergeFrom((com.google.datastore.v1.LookupResponse) other);
+        return mergeFrom((com.google.datastore.v1.LookupResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -740,10 +700,9 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) {
             foundBuilder_ = null;
             found_ = other.found_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            foundBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getFoundFieldBuilder()
-                    : null;
+            foundBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getFoundFieldBuilder() : null;
           } else {
             foundBuilder_.addAllMessages(other.found_);
           }
@@ -767,10 +726,9 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) {
             missingBuilder_ = null;
             missing_ = other.missing_;
             bitField0_ = (bitField0_ & ~0x00000002);
-            missingBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getMissingFieldBuilder()
-                    : null;
+            missingBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getMissingFieldBuilder() : null;
           } else {
             missingBuilder_.addAllMessages(other.missing_);
           }
@@ -794,10 +752,9 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) {
             deferredBuilder_ = null;
             deferred_ = other.deferred_;
             bitField0_ = (bitField0_ & ~0x00000004);
-            deferredBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getDeferredFieldBuilder()
-                    : null;
+            deferredBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getDeferredFieldBuilder() : null;
           } else {
             deferredBuilder_.addAllMessages(other.deferred_);
           }
@@ -831,28 +788,21 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
     private java.util.List found_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureFoundIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
         found_ = new java.util.ArrayList(found_);
         bitField0_ |= 0x00000001;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.EntityResult,
-            com.google.datastore.v1.EntityResult.Builder,
-            com.google.datastore.v1.EntityResultOrBuilder>
-        foundBuilder_;
+        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> foundBuilder_;
 
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -869,8 +819,6 @@ public java.util.List getFoundList() {
       }
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -887,8 +835,6 @@ public int getFoundCount() {
       }
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -905,8 +851,6 @@ public com.google.datastore.v1.EntityResult getFound(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -915,7 +859,8 @@ public com.google.datastore.v1.EntityResult getFound(int index) {
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public Builder setFound(int index, com.google.datastore.v1.EntityResult value) {
+    public Builder setFound(
+        int index, com.google.datastore.v1.EntityResult value) {
       if (foundBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -929,8 +874,6 @@ public Builder setFound(int index, com.google.datastore.v1.EntityResult value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -951,8 +894,6 @@ public Builder setFound(
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -975,8 +916,6 @@ public Builder addFound(com.google.datastore.v1.EntityResult value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -985,7 +924,8 @@ public Builder addFound(com.google.datastore.v1.EntityResult value) {
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public Builder addFound(int index, com.google.datastore.v1.EntityResult value) {
+    public Builder addFound(
+        int index, com.google.datastore.v1.EntityResult value) {
       if (foundBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -999,8 +939,6 @@ public Builder addFound(int index, com.google.datastore.v1.EntityResult value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1009,7 +947,8 @@ public Builder addFound(int index, com.google.datastore.v1.EntityResult value) {
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public Builder addFound(com.google.datastore.v1.EntityResult.Builder builderForValue) {
+    public Builder addFound(
+        com.google.datastore.v1.EntityResult.Builder builderForValue) {
       if (foundBuilder_ == null) {
         ensureFoundIsMutable();
         found_.add(builderForValue.build());
@@ -1020,8 +959,6 @@ public Builder addFound(com.google.datastore.v1.EntityResult.Builder builderForV
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1042,8 +979,6 @@ public Builder addFound(
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1056,7 +991,8 @@ public Builder addAllFound(
         java.lang.Iterable values) {
       if (foundBuilder_ == null) {
         ensureFoundIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, found_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, found_);
         onChanged();
       } else {
         foundBuilder_.addAllMessages(values);
@@ -1064,8 +1000,6 @@ public Builder addAllFound(
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1085,8 +1019,6 @@ public Builder clearFound() {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1106,8 +1038,6 @@ public Builder removeFound(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1116,12 +1046,11 @@ public Builder removeFound(int index) {
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public com.google.datastore.v1.EntityResult.Builder getFoundBuilder(int index) {
+    public com.google.datastore.v1.EntityResult.Builder getFoundBuilder(
+        int index) {
       return getFoundFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1130,16 +1059,14 @@ public com.google.datastore.v1.EntityResult.Builder getFoundBuilder(int index) {
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index) {
+    public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
+        int index) {
       if (foundBuilder_ == null) {
-        return found_.get(index);
-      } else {
+        return found_.get(index);  } else {
         return foundBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1148,8 +1075,8 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public java.util.List
-        getFoundOrBuilderList() {
+    public java.util.List 
+         getFoundOrBuilderList() {
       if (foundBuilder_ != null) {
         return foundBuilder_.getMessageOrBuilderList();
       } else {
@@ -1157,8 +1084,6 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index
       }
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1168,12 +1093,10 @@ public com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
     public com.google.datastore.v1.EntityResult.Builder addFoundBuilder() {
-      return getFoundFieldBuilder()
-          .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance());
+      return getFoundFieldBuilder().addBuilder(
+          com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1182,13 +1105,12 @@ public com.google.datastore.v1.EntityResult.Builder addFoundBuilder() {
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public com.google.datastore.v1.EntityResult.Builder addFoundBuilder(int index) {
-      return getFoundFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance());
+    public com.google.datastore.v1.EntityResult.Builder addFoundBuilder(
+        int index) {
+      return getFoundFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Entities found as `ResultType.FULL` entities. The order of results in this
      * field is undefined and has no relation to the order of the keys in the
@@ -1197,46 +1119,38 @@ public com.google.datastore.v1.EntityResult.Builder addFoundBuilder(int index) {
      *
      * repeated .google.datastore.v1.EntityResult found = 1;
      */
-    public java.util.List getFoundBuilderList() {
+    public java.util.List 
+         getFoundBuilderList() {
       return getFoundFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.EntityResult,
-            com.google.datastore.v1.EntityResult.Builder,
-            com.google.datastore.v1.EntityResultOrBuilder>
+        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> 
         getFoundFieldBuilder() {
       if (foundBuilder_ == null) {
-        foundBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.EntityResult,
-                com.google.datastore.v1.EntityResult.Builder,
-                com.google.datastore.v1.EntityResultOrBuilder>(
-                found_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        foundBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>(
+                found_,
+                ((bitField0_ & 0x00000001) != 0),
+                getParentForChildren(),
+                isClean());
         found_ = null;
       }
       return foundBuilder_;
     }
 
     private java.util.List missing_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureMissingIsMutable() {
       if (!((bitField0_ & 0x00000002) != 0)) {
         missing_ = new java.util.ArrayList(missing_);
         bitField0_ |= 0x00000002;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.EntityResult,
-            com.google.datastore.v1.EntityResult.Builder,
-            com.google.datastore.v1.EntityResultOrBuilder>
-        missingBuilder_;
+        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> missingBuilder_;
 
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1253,8 +1167,6 @@ public java.util.List getMissingList() {
       }
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1271,8 +1183,6 @@ public int getMissingCount() {
       }
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1289,8 +1199,6 @@ public com.google.datastore.v1.EntityResult getMissing(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1299,7 +1207,8 @@ public com.google.datastore.v1.EntityResult getMissing(int index) {
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public Builder setMissing(int index, com.google.datastore.v1.EntityResult value) {
+    public Builder setMissing(
+        int index, com.google.datastore.v1.EntityResult value) {
       if (missingBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1313,8 +1222,6 @@ public Builder setMissing(int index, com.google.datastore.v1.EntityResult value)
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1335,8 +1242,6 @@ public Builder setMissing(
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1359,8 +1264,6 @@ public Builder addMissing(com.google.datastore.v1.EntityResult value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1369,7 +1272,8 @@ public Builder addMissing(com.google.datastore.v1.EntityResult value) {
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public Builder addMissing(int index, com.google.datastore.v1.EntityResult value) {
+    public Builder addMissing(
+        int index, com.google.datastore.v1.EntityResult value) {
       if (missingBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1383,8 +1287,6 @@ public Builder addMissing(int index, com.google.datastore.v1.EntityResult value)
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1393,7 +1295,8 @@ public Builder addMissing(int index, com.google.datastore.v1.EntityResult value)
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public Builder addMissing(com.google.datastore.v1.EntityResult.Builder builderForValue) {
+    public Builder addMissing(
+        com.google.datastore.v1.EntityResult.Builder builderForValue) {
       if (missingBuilder_ == null) {
         ensureMissingIsMutable();
         missing_.add(builderForValue.build());
@@ -1404,8 +1307,6 @@ public Builder addMissing(com.google.datastore.v1.EntityResult.Builder builderFo
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1426,8 +1327,6 @@ public Builder addMissing(
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1440,7 +1339,8 @@ public Builder addAllMissing(
         java.lang.Iterable values) {
       if (missingBuilder_ == null) {
         ensureMissingIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, missing_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, missing_);
         onChanged();
       } else {
         missingBuilder_.addAllMessages(values);
@@ -1448,8 +1348,6 @@ public Builder addAllMissing(
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1469,8 +1367,6 @@ public Builder clearMissing() {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1490,8 +1386,6 @@ public Builder removeMissing(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1500,12 +1394,11 @@ public Builder removeMissing(int index) {
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public com.google.datastore.v1.EntityResult.Builder getMissingBuilder(int index) {
+    public com.google.datastore.v1.EntityResult.Builder getMissingBuilder(
+        int index) {
       return getMissingFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1514,16 +1407,14 @@ public com.google.datastore.v1.EntityResult.Builder getMissingBuilder(int index)
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int index) {
+    public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
+        int index) {
       if (missingBuilder_ == null) {
-        return missing_.get(index);
-      } else {
+        return missing_.get(index);  } else {
         return missingBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1532,8 +1423,8 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public java.util.List
-        getMissingOrBuilderList() {
+    public java.util.List 
+         getMissingOrBuilderList() {
       if (missingBuilder_ != null) {
         return missingBuilder_.getMessageOrBuilderList();
       } else {
@@ -1541,8 +1432,6 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind
       }
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1552,12 +1441,10 @@ public com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int ind
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
     public com.google.datastore.v1.EntityResult.Builder addMissingBuilder() {
-      return getMissingFieldBuilder()
-          .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance());
+      return getMissingFieldBuilder().addBuilder(
+          com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1566,13 +1453,12 @@ public com.google.datastore.v1.EntityResult.Builder addMissingBuilder() {
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public com.google.datastore.v1.EntityResult.Builder addMissingBuilder(int index) {
-      return getMissingFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance());
+    public com.google.datastore.v1.EntityResult.Builder addMissingBuilder(
+        int index) {
+      return getMissingFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
      * in this field is undefined and has no relation to the order of the keys
@@ -1581,46 +1467,38 @@ public com.google.datastore.v1.EntityResult.Builder addMissingBuilder(int index)
      *
      * repeated .google.datastore.v1.EntityResult missing = 2;
      */
-    public java.util.List getMissingBuilderList() {
+    public java.util.List 
+         getMissingBuilderList() {
       return getMissingFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.EntityResult,
-            com.google.datastore.v1.EntityResult.Builder,
-            com.google.datastore.v1.EntityResultOrBuilder>
+        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> 
         getMissingFieldBuilder() {
       if (missingBuilder_ == null) {
-        missingBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.EntityResult,
-                com.google.datastore.v1.EntityResult.Builder,
-                com.google.datastore.v1.EntityResultOrBuilder>(
-                missing_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+        missingBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>(
+                missing_,
+                ((bitField0_ & 0x00000002) != 0),
+                getParentForChildren(),
+                isClean());
         missing_ = null;
       }
       return missingBuilder_;
     }
 
     private java.util.List deferred_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureDeferredIsMutable() {
       if (!((bitField0_ & 0x00000004) != 0)) {
         deferred_ = new java.util.ArrayList(deferred_);
         bitField0_ |= 0x00000004;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
-        deferredBuilder_;
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> deferredBuilder_;
 
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1637,8 +1515,6 @@ public java.util.List getDeferredList() {
       }
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1655,8 +1531,6 @@ public int getDeferredCount() {
       }
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1673,8 +1547,6 @@ public com.google.datastore.v1.Key getDeferred(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1683,7 +1555,8 @@ public com.google.datastore.v1.Key getDeferred(int index) {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public Builder setDeferred(int index, com.google.datastore.v1.Key value) {
+    public Builder setDeferred(
+        int index, com.google.datastore.v1.Key value) {
       if (deferredBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1697,8 +1570,6 @@ public Builder setDeferred(int index, com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1707,7 +1578,8 @@ public Builder setDeferred(int index, com.google.datastore.v1.Key value) {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public Builder setDeferred(int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setDeferred(
+        int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (deferredBuilder_ == null) {
         ensureDeferredIsMutable();
         deferred_.set(index, builderForValue.build());
@@ -1718,8 +1590,6 @@ public Builder setDeferred(int index, com.google.datastore.v1.Key.Builder builde
       return this;
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1742,8 +1612,6 @@ public Builder addDeferred(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1752,7 +1620,8 @@ public Builder addDeferred(com.google.datastore.v1.Key value) {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public Builder addDeferred(int index, com.google.datastore.v1.Key value) {
+    public Builder addDeferred(
+        int index, com.google.datastore.v1.Key value) {
       if (deferredBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1766,8 +1635,6 @@ public Builder addDeferred(int index, com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1776,7 +1643,8 @@ public Builder addDeferred(int index, com.google.datastore.v1.Key value) {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public Builder addDeferred(com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addDeferred(
+        com.google.datastore.v1.Key.Builder builderForValue) {
       if (deferredBuilder_ == null) {
         ensureDeferredIsMutable();
         deferred_.add(builderForValue.build());
@@ -1787,8 +1655,6 @@ public Builder addDeferred(com.google.datastore.v1.Key.Builder builderForValue)
       return this;
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1797,7 +1663,8 @@ public Builder addDeferred(com.google.datastore.v1.Key.Builder builderForValue)
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public Builder addDeferred(int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addDeferred(
+        int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (deferredBuilder_ == null) {
         ensureDeferredIsMutable();
         deferred_.add(index, builderForValue.build());
@@ -1808,8 +1675,6 @@ public Builder addDeferred(int index, com.google.datastore.v1.Key.Builder builde
       return this;
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1822,7 +1687,8 @@ public Builder addAllDeferred(
         java.lang.Iterable values) {
       if (deferredBuilder_ == null) {
         ensureDeferredIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, deferred_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, deferred_);
         onChanged();
       } else {
         deferredBuilder_.addAllMessages(values);
@@ -1830,8 +1696,6 @@ public Builder addAllDeferred(
       return this;
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1851,8 +1715,6 @@ public Builder clearDeferred() {
       return this;
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1872,8 +1734,6 @@ public Builder removeDeferred(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1882,12 +1742,11 @@ public Builder removeDeferred(int index) {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public com.google.datastore.v1.Key.Builder getDeferredBuilder(int index) {
+    public com.google.datastore.v1.Key.Builder getDeferredBuilder(
+        int index) {
       return getDeferredFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1896,16 +1755,14 @@ public com.google.datastore.v1.Key.Builder getDeferredBuilder(int index) {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
+    public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(
+        int index) {
       if (deferredBuilder_ == null) {
-        return deferred_.get(index);
-      } else {
+        return deferred_.get(index);  } else {
         return deferredBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1914,8 +1771,8 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public java.util.List
-        getDeferredOrBuilderList() {
+    public java.util.List 
+         getDeferredOrBuilderList() {
       if (deferredBuilder_ != null) {
         return deferredBuilder_.getMessageOrBuilderList();
       } else {
@@ -1923,8 +1780,6 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1934,11 +1789,10 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index) {
      * repeated .google.datastore.v1.Key deferred = 3;
      */
     public com.google.datastore.v1.Key.Builder addDeferredBuilder() {
-      return getDeferredFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
+      return getDeferredFieldBuilder().addBuilder(
+          com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1947,13 +1801,12 @@ public com.google.datastore.v1.Key.Builder addDeferredBuilder() {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public com.google.datastore.v1.Key.Builder addDeferredBuilder(int index) {
-      return getDeferredFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
+    public com.google.datastore.v1.Key.Builder addDeferredBuilder(
+        int index) {
+      return getDeferredFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * A list of keys that were not looked up due to resource constraints. The
      * order of results in this field is undefined and has no relation to the
@@ -1962,29 +1815,27 @@ public com.google.datastore.v1.Key.Builder addDeferredBuilder(int index) {
      *
      * repeated .google.datastore.v1.Key deferred = 3;
      */
-    public java.util.List getDeferredBuilderList() {
+    public java.util.List 
+         getDeferredBuilderList() {
       return getDeferredFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
         getDeferredFieldBuilder() {
       if (deferredBuilder_ == null) {
-        deferredBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.Key,
-                com.google.datastore.v1.Key.Builder,
-                com.google.datastore.v1.KeyOrBuilder>(
-                deferred_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+        deferredBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+                deferred_,
+                ((bitField0_ & 0x00000004) != 0),
+                getParentForChildren(),
+                isClean());
         deferred_ = null;
       }
       return deferredBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1994,12 +1845,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.LookupResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.LookupResponse)
   private static final com.google.datastore.v1.LookupResponse DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.LookupResponse();
   }
@@ -2008,16 +1859,16 @@ public static com.google.datastore.v1.LookupResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public LookupResponse parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new LookupResponse(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public LookupResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new LookupResponse(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -2032,4 +1883,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java
index 94adc480e..7f3cf0f09 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponseOrBuilder.java
@@ -18,14 +18,11 @@
 
 package com.google.datastore.v1;
 
-public interface LookupResponseOrBuilder
-    extends
+public interface LookupResponseOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.LookupResponse)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -34,10 +31,9 @@ public interface LookupResponseOrBuilder
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
-  java.util.List getFoundList();
+  java.util.List 
+      getFoundList();
   /**
-   *
-   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -48,8 +44,6 @@ public interface LookupResponseOrBuilder
    */
   com.google.datastore.v1.EntityResult getFound(int index);
   /**
-   *
-   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -60,8 +54,6 @@ public interface LookupResponseOrBuilder
    */
   int getFoundCount();
   /**
-   *
-   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -70,10 +62,9 @@ public interface LookupResponseOrBuilder
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
-  java.util.List getFoundOrBuilderList();
+  java.util.List 
+      getFoundOrBuilderList();
   /**
-   *
-   *
    * 
    * Entities found as `ResultType.FULL` entities. The order of results in this
    * field is undefined and has no relation to the order of the keys in the
@@ -82,11 +73,10 @@ public interface LookupResponseOrBuilder
    *
    * repeated .google.datastore.v1.EntityResult found = 1;
    */
-  com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(int index);
+  com.google.datastore.v1.EntityResultOrBuilder getFoundOrBuilder(
+      int index);
 
   /**
-   *
-   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -95,10 +85,9 @@ public interface LookupResponseOrBuilder
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
-  java.util.List getMissingList();
+  java.util.List 
+      getMissingList();
   /**
-   *
-   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -109,8 +98,6 @@ public interface LookupResponseOrBuilder
    */
   com.google.datastore.v1.EntityResult getMissing(int index);
   /**
-   *
-   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -121,8 +108,6 @@ public interface LookupResponseOrBuilder
    */
   int getMissingCount();
   /**
-   *
-   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -131,10 +116,9 @@ public interface LookupResponseOrBuilder
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
-  java.util.List getMissingOrBuilderList();
+  java.util.List 
+      getMissingOrBuilderList();
   /**
-   *
-   *
    * 
    * Entities not found as `ResultType.KEY_ONLY` entities. The order of results
    * in this field is undefined and has no relation to the order of the keys
@@ -143,11 +127,10 @@ public interface LookupResponseOrBuilder
    *
    * repeated .google.datastore.v1.EntityResult missing = 2;
    */
-  com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(int index);
+  com.google.datastore.v1.EntityResultOrBuilder getMissingOrBuilder(
+      int index);
 
   /**
-   *
-   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -156,10 +139,9 @@ public interface LookupResponseOrBuilder
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
-  java.util.List getDeferredList();
+  java.util.List 
+      getDeferredList();
   /**
-   *
-   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -170,8 +152,6 @@ public interface LookupResponseOrBuilder
    */
   com.google.datastore.v1.Key getDeferred(int index);
   /**
-   *
-   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -182,8 +162,6 @@ public interface LookupResponseOrBuilder
    */
   int getDeferredCount();
   /**
-   *
-   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -192,10 +170,9 @@ public interface LookupResponseOrBuilder
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
-  java.util.List getDeferredOrBuilderList();
+  java.util.List 
+      getDeferredOrBuilderList();
   /**
-   *
-   *
    * 
    * A list of keys that were not looked up due to resource constraints. The
    * order of results in this field is undefined and has no relation to the
@@ -204,5 +181,6 @@ public interface LookupResponseOrBuilder
    *
    * repeated .google.datastore.v1.Key deferred = 3;
    */
-  com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(int index);
+  com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(
+      int index);
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java
index b92d928b8..1705e4b0f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java
@@ -19,37 +19,36 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A mutation to apply to an entity.
  * 

  *
  * Protobuf type {@code google.datastore.v1.Mutation}
  */
-public final class Mutation extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class Mutation extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Mutation)
     MutationOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use Mutation.newBuilder() to construct.
   private Mutation(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private Mutation() {}
+  private Mutation() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new Mutation();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private Mutation(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -68,111 +67,103 @@ private Mutation(
           case 0:
             done = true;
             break;
-          case 34:
-            {
-              com.google.datastore.v1.Entity.Builder subBuilder = null;
-              if (operationCase_ == 4) {
-                subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
-              }
-              operation_ =
-                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
-                operation_ = subBuilder.buildPartial();
-              }
-              operationCase_ = 4;
-              break;
+          case 34: {
+            com.google.datastore.v1.Entity.Builder subBuilder = null;
+            if (operationCase_ == 4) {
+              subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
             }
-          case 42:
-            {
-              com.google.datastore.v1.Entity.Builder subBuilder = null;
-              if (operationCase_ == 5) {
-                subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
-              }
-              operation_ =
-                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
-                operation_ = subBuilder.buildPartial();
-              }
-              operationCase_ = 5;
-              break;
+            operation_ =
+                input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
+              operation_ = subBuilder.buildPartial();
             }
-          case 50:
-            {
-              com.google.datastore.v1.Entity.Builder subBuilder = null;
-              if (operationCase_ == 6) {
-                subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
-              }
-              operation_ =
-                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
-                operation_ = subBuilder.buildPartial();
-              }
-              operationCase_ = 6;
-              break;
+            operationCase_ = 4;
+            break;
+          }
+          case 42: {
+            com.google.datastore.v1.Entity.Builder subBuilder = null;
+            if (operationCase_ == 5) {
+              subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
             }
-          case 58:
-            {
-              com.google.datastore.v1.Key.Builder subBuilder = null;
-              if (operationCase_ == 7) {
-                subBuilder = ((com.google.datastore.v1.Key) operation_).toBuilder();
-              }
-              operation_ =
-                  input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Key) operation_);
-                operation_ = subBuilder.buildPartial();
-              }
-              operationCase_ = 7;
-              break;
+            operation_ =
+                input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
+              operation_ = subBuilder.buildPartial();
             }
-          case 64:
-            {
-              conflictDetectionStrategyCase_ = 8;
-              conflictDetectionStrategy_ = input.readInt64();
-              break;
+            operationCase_ = 5;
+            break;
+          }
+          case 50: {
+            com.google.datastore.v1.Entity.Builder subBuilder = null;
+            if (operationCase_ == 6) {
+              subBuilder = ((com.google.datastore.v1.Entity) operation_).toBuilder();
+            }
+            operation_ =
+                input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.Entity) operation_);
+              operation_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            operationCase_ = 6;
+            break;
+          }
+          case 58: {
+            com.google.datastore.v1.Key.Builder subBuilder = null;
+            if (operationCase_ == 7) {
+              subBuilder = ((com.google.datastore.v1.Key) operation_).toBuilder();
             }
+            operation_ =
+                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.Key) operation_);
+              operation_ = subBuilder.buildPartial();
+            }
+            operationCase_ = 7;
+            break;
+          }
+          case 64: {
+            conflictDetectionStrategyCase_ = 8;
+            conflictDetectionStrategy_ = input.readInt64();
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_Mutation_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_Mutation_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.Mutation.class, com.google.datastore.v1.Mutation.Builder.class);
   }
 
   private int operationCase_ = 0;
   private java.lang.Object operation_;
-
   public enum OperationCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
+      implements com.google.protobuf.Internal.EnumLite,
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     INSERT(4),
     UPDATE(5),
@@ -180,7 +171,6 @@ public enum OperationCase
     DELETE(7),
     OPERATION_NOT_SET(0);
     private final int value;
-
     private OperationCase(int value) {
       this.value = value;
     }
@@ -196,41 +186,33 @@ public static OperationCase valueOf(int value) {
 
     public static OperationCase forNumber(int value) {
       switch (value) {
-        case 4:
-          return INSERT;
-        case 5:
-          return UPDATE;
-        case 6:
-          return UPSERT;
-        case 7:
-          return DELETE;
-        case 0:
-          return OPERATION_NOT_SET;
-        default:
-          return null;
+        case 4: return INSERT;
+        case 5: return UPDATE;
+        case 6: return UPSERT;
+        case 7: return DELETE;
+        case 0: return OPERATION_NOT_SET;
+        default: return null;
       }
     }
-
     public int getNumber() {
       return this.value;
     }
   };
 
-  public OperationCase getOperationCase() {
-    return OperationCase.forNumber(operationCase_);
+  public OperationCase
+  getOperationCase() {
+    return OperationCase.forNumber(
+        operationCase_);
   }
 
   private int conflictDetectionStrategyCase_ = 0;
   private java.lang.Object conflictDetectionStrategy_;
-
   public enum ConflictDetectionStrategyCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
+      implements com.google.protobuf.Internal.EnumLite,
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     BASE_VERSION(8),
     CONFLICTDETECTIONSTRATEGY_NOT_SET(0);
     private final int value;
-
     private ConflictDetectionStrategyCase(int value) {
       this.value = value;
     }
@@ -246,61 +228,51 @@ public static ConflictDetectionStrategyCase valueOf(int value) {
 
     public static ConflictDetectionStrategyCase forNumber(int value) {
       switch (value) {
-        case 8:
-          return BASE_VERSION;
-        case 0:
-          return CONFLICTDETECTIONSTRATEGY_NOT_SET;
-        default:
-          return null;
+        case 8: return BASE_VERSION;
+        case 0: return CONFLICTDETECTIONSTRATEGY_NOT_SET;
+        default: return null;
       }
     }
-
     public int getNumber() {
       return this.value;
     }
   };
 
-  public ConflictDetectionStrategyCase getConflictDetectionStrategyCase() {
-    return ConflictDetectionStrategyCase.forNumber(conflictDetectionStrategyCase_);
+  public ConflictDetectionStrategyCase
+  getConflictDetectionStrategyCase() {
+    return ConflictDetectionStrategyCase.forNumber(
+        conflictDetectionStrategyCase_);
   }
 
   public static final int INSERT_FIELD_NUMBER = 4;
   /**
-   *
-   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
    * 

    *
    * .google.datastore.v1.Entity insert = 4;
-   *
    * @return Whether the insert field is set.
    */
   public boolean hasInsert() {
     return operationCase_ == 4;
   }
   /**
-   *
-   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
    * 

    *
    * .google.datastore.v1.Entity insert = 4;
-   *
    * @return The insert.
    */
   public com.google.datastore.v1.Entity getInsert() {
     if (operationCase_ == 4) {
-      return (com.google.datastore.v1.Entity) operation_;
+       return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
@@ -310,48 +282,40 @@ public com.google.datastore.v1.Entity getInsert() {
    */
   public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
     if (operationCase_ == 4) {
-      return (com.google.datastore.v1.Entity) operation_;
+       return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
 
   public static final int UPDATE_FIELD_NUMBER = 5;
   /**
-   *
-   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
    * 

    *
    * .google.datastore.v1.Entity update = 5;
-   *
    * @return Whether the update field is set.
    */
   public boolean hasUpdate() {
     return operationCase_ == 5;
   }
   /**
-   *
-   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
    * 

    *
    * .google.datastore.v1.Entity update = 5;
-   *
    * @return The update.
    */
   public com.google.datastore.v1.Entity getUpdate() {
     if (operationCase_ == 5) {
-      return (com.google.datastore.v1.Entity) operation_;
+       return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
@@ -361,48 +325,40 @@ public com.google.datastore.v1.Entity getUpdate() {
    */
   public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
     if (operationCase_ == 5) {
-      return (com.google.datastore.v1.Entity) operation_;
+       return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
 
   public static final int UPSERT_FIELD_NUMBER = 6;
   /**
-   *
-   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
    * 

    *
    * .google.datastore.v1.Entity upsert = 6;
-   *
    * @return Whether the upsert field is set.
    */
   public boolean hasUpsert() {
     return operationCase_ == 6;
   }
   /**
-   *
-   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
    * 

    *
    * .google.datastore.v1.Entity upsert = 6;
-   *
    * @return The upsert.
    */
   public com.google.datastore.v1.Entity getUpsert() {
     if (operationCase_ == 6) {
-      return (com.google.datastore.v1.Entity) operation_;
+       return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
@@ -412,48 +368,40 @@ public com.google.datastore.v1.Entity getUpsert() {
    */
   public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
     if (operationCase_ == 6) {
-      return (com.google.datastore.v1.Entity) operation_;
+       return (com.google.datastore.v1.Entity) operation_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
 
   public static final int DELETE_FIELD_NUMBER = 7;
   /**
-   *
-   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
    * 

    *
    * .google.datastore.v1.Key delete = 7;
-   *
    * @return Whether the delete field is set.
    */
   public boolean hasDelete() {
     return operationCase_ == 7;
   }
   /**
-   *
-   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
    * 

    *
    * .google.datastore.v1.Key delete = 7;
-   *
    * @return The delete.
    */
   public com.google.datastore.v1.Key getDelete() {
     if (operationCase_ == 7) {
-      return (com.google.datastore.v1.Key) operation_;
+       return (com.google.datastore.v1.Key) operation_;
     }
     return com.google.datastore.v1.Key.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
@@ -463,22 +411,19 @@ public com.google.datastore.v1.Key getDelete() {
    */
   public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
     if (operationCase_ == 7) {
-      return (com.google.datastore.v1.Key) operation_;
+       return (com.google.datastore.v1.Key) operation_;
     }
     return com.google.datastore.v1.Key.getDefaultInstance();
   }
 
   public static final int BASE_VERSION_FIELD_NUMBER = 8;
   /**
-   *
-   *
    * 
    * The version of the entity that this mutation is being applied to. If this
    * does not match the current version on the server, the mutation conflicts.
    * 

    *
    * int64 base_version = 8;
-   *
    * @return The baseVersion.
    */
   public long getBaseVersion() {
@@ -489,7 +434,6 @@ public long getBaseVersion() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -501,7 +445,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (operationCase_ == 4) {
       output.writeMessage(4, (com.google.datastore.v1.Entity) operation_);
     }
@@ -515,7 +460,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       output.writeMessage(7, (com.google.datastore.v1.Key) operation_);
     }
     if (conflictDetectionStrategyCase_ == 8) {
-      output.writeInt64(8, (long) ((java.lang.Long) conflictDetectionStrategy_));
+      output.writeInt64(
+          8, (long)((java.lang.Long) conflictDetectionStrategy_));
     }
     unknownFields.writeTo(output);
   }
@@ -527,29 +473,25 @@ public int getSerializedSize() {
 
     size = 0;
     if (operationCase_ == 4) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              4, (com.google.datastore.v1.Entity) operation_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(4, (com.google.datastore.v1.Entity) operation_);
     }
     if (operationCase_ == 5) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              5, (com.google.datastore.v1.Entity) operation_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(5, (com.google.datastore.v1.Entity) operation_);
     }
     if (operationCase_ == 6) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              6, (com.google.datastore.v1.Entity) operation_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(6, (com.google.datastore.v1.Entity) operation_);
     }
     if (operationCase_ == 7) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              7, (com.google.datastore.v1.Key) operation_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(7, (com.google.datastore.v1.Key) operation_);
     }
     if (conflictDetectionStrategyCase_ == 8) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeInt64Size(
-              8, (long) ((java.lang.Long) conflictDetectionStrategy_));
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(
+            8, (long)((java.lang.Long) conflictDetectionStrategy_));
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -559,7 +501,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Mutation)) {
       return super.equals(obj);
@@ -569,25 +511,29 @@ public boolean equals(final java.lang.Object obj) {
     if (!getOperationCase().equals(other.getOperationCase())) return false;
     switch (operationCase_) {
       case 4:
-        if (!getInsert().equals(other.getInsert())) return false;
+        if (!getInsert()
+            .equals(other.getInsert())) return false;
         break;
       case 5:
-        if (!getUpdate().equals(other.getUpdate())) return false;
+        if (!getUpdate()
+            .equals(other.getUpdate())) return false;
         break;
       case 6:
-        if (!getUpsert().equals(other.getUpsert())) return false;
+        if (!getUpsert()
+            .equals(other.getUpsert())) return false;
         break;
       case 7:
-        if (!getDelete().equals(other.getDelete())) return false;
+        if (!getDelete()
+            .equals(other.getDelete())) return false;
         break;
       case 0:
       default:
     }
-    if (!getConflictDetectionStrategyCase().equals(other.getConflictDetectionStrategyCase()))
-      return false;
+    if (!getConflictDetectionStrategyCase().equals(other.getConflictDetectionStrategyCase())) return false;
     switch (conflictDetectionStrategyCase_) {
       case 8:
-        if (getBaseVersion() != other.getBaseVersion()) return false;
+        if (getBaseVersion()
+            != other.getBaseVersion()) return false;
         break;
       case 0:
       default:
@@ -626,7 +572,8 @@ public int hashCode() {
     switch (conflictDetectionStrategyCase_) {
       case 8:
         hash = (37 * hash) + BASE_VERSION_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getBaseVersion());
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getBaseVersion());
         break;
       case 0:
       default:
@@ -636,126 +583,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Mutation parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Mutation parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Mutation parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Mutation parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.Mutation parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Mutation parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Mutation parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Mutation parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Mutation parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Mutation parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Mutation parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Mutation parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Mutation parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Mutation parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.Mutation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A mutation to apply to an entity.
    * 

    *
    * Protobuf type {@code google.datastore.v1.Mutation}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Mutation)
       com.google.datastore.v1.MutationOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_Mutation_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_Mutation_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.Mutation.class,
-              com.google.datastore.v1.Mutation.Builder.class);
+              com.google.datastore.v1.Mutation.class, com.google.datastore.v1.Mutation.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.Mutation.newBuilder()
@@ -763,15 +702,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -783,9 +723,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_Mutation_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor;
     }
 
     @java.lang.Override
@@ -846,39 +786,38 @@ public com.google.datastore.v1.Mutation buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Mutation) {
-        return mergeFrom((com.google.datastore.v1.Mutation) other);
+        return mergeFrom((com.google.datastore.v1.Mutation)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -888,41 +827,34 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.datastore.v1.Mutation other) {
       if (other == com.google.datastore.v1.Mutation.getDefaultInstance()) return this;
       switch (other.getOperationCase()) {
-        case INSERT:
-          {
-            mergeInsert(other.getInsert());
-            break;
-          }
-        case UPDATE:
-          {
-            mergeUpdate(other.getUpdate());
-            break;
-          }
-        case UPSERT:
-          {
-            mergeUpsert(other.getUpsert());
-            break;
-          }
-        case DELETE:
-          {
-            mergeDelete(other.getDelete());
-            break;
-          }
-        case OPERATION_NOT_SET:
-          {
-            break;
-          }
+        case INSERT: {
+          mergeInsert(other.getInsert());
+          break;
+        }
+        case UPDATE: {
+          mergeUpdate(other.getUpdate());
+          break;
+        }
+        case UPSERT: {
+          mergeUpsert(other.getUpsert());
+          break;
+        }
+        case DELETE: {
+          mergeDelete(other.getDelete());
+          break;
+        }
+        case OPERATION_NOT_SET: {
+          break;
+        }
       }
       switch (other.getConflictDetectionStrategyCase()) {
-        case BASE_VERSION:
-          {
-            setBaseVersion(other.getBaseVersion());
-            break;
-          }
-        case CONFLICTDETECTIONSTRATEGY_NOT_SET:
-          {
-            break;
-          }
+        case BASE_VERSION: {
+          setBaseVersion(other.getBaseVersion());
+          break;
+        }
+        case CONFLICTDETECTIONSTRATEGY_NOT_SET: {
+          break;
+        }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -952,12 +884,12 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int operationCase_ = 0;
     private java.lang.Object operation_;
-
-    public OperationCase getOperationCase() {
-      return OperationCase.forNumber(operationCase_);
+    public OperationCase
+        getOperationCase() {
+      return OperationCase.forNumber(
+          operationCase_);
     }
 
     public Builder clearOperation() {
@@ -969,9 +901,10 @@ public Builder clearOperation() {
 
     private int conflictDetectionStrategyCase_ = 0;
     private java.lang.Object conflictDetectionStrategy_;
-
-    public ConflictDetectionStrategyCase getConflictDetectionStrategyCase() {
-      return ConflictDetectionStrategyCase.forNumber(conflictDetectionStrategyCase_);
+    public ConflictDetectionStrategyCase
+        getConflictDetectionStrategyCase() {
+      return ConflictDetectionStrategyCase.forNumber(
+          conflictDetectionStrategyCase_);
     }
 
     public Builder clearConflictDetectionStrategy() {
@@ -981,36 +914,28 @@ public Builder clearConflictDetectionStrategy() {
       return this;
     }
 
+
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity,
-            com.google.datastore.v1.Entity.Builder,
-            com.google.datastore.v1.EntityOrBuilder>
-        insertBuilder_;
+        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> insertBuilder_;
     /**
-     *
-     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
      * 

      *
      * .google.datastore.v1.Entity insert = 4;
-     *
      * @return Whether the insert field is set.
      */
     public boolean hasInsert() {
       return operationCase_ == 4;
     }
     /**
-     *
-     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
      * 

      *
      * .google.datastore.v1.Entity insert = 4;
-     *
      * @return The insert.
      */
     public com.google.datastore.v1.Entity getInsert() {
@@ -1027,8 +952,6 @@ public com.google.datastore.v1.Entity getInsert() {
       }
     }
     /**
-     *
-     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -1050,8 +973,6 @@ public Builder setInsert(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -1059,7 +980,8 @@ public Builder setInsert(com.google.datastore.v1.Entity value) {
      *
      * .google.datastore.v1.Entity insert = 4;
      */
-    public Builder setInsert(com.google.datastore.v1.Entity.Builder builderForValue) {
+    public Builder setInsert(
+        com.google.datastore.v1.Entity.Builder builderForValue) {
       if (insertBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -1070,8 +992,6 @@ public Builder setInsert(com.google.datastore.v1.Entity.Builder builderForValue)
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -1081,12 +1001,10 @@ public Builder setInsert(com.google.datastore.v1.Entity.Builder builderForValue)
      */
     public Builder mergeInsert(com.google.datastore.v1.Entity value) {
       if (insertBuilder_ == null) {
-        if (operationCase_ == 4
-            && operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
-          operation_ =
-              com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (operationCase_ == 4 &&
+            operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
+          operation_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
+              .mergeFrom(value).buildPartial();
         } else {
           operation_ = value;
         }
@@ -1101,8 +1019,6 @@ public Builder mergeInsert(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -1127,8 +1043,6 @@ public Builder clearInsert() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -1140,8 +1054,6 @@ public com.google.datastore.v1.Entity.Builder getInsertBuilder() {
       return getInsertFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -1160,8 +1072,6 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * The entity to insert. The entity must not already exist.
      * The entity key's final path element may be incomplete.
@@ -1170,58 +1080,45 @@ public com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder() {
      * .google.datastore.v1.Entity insert = 4;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity,
-            com.google.datastore.v1.Entity.Builder,
-            com.google.datastore.v1.EntityOrBuilder>
+        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> 
         getInsertFieldBuilder() {
       if (insertBuilder_ == null) {
         if (!(operationCase_ == 4)) {
           operation_ = com.google.datastore.v1.Entity.getDefaultInstance();
         }
-        insertBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Entity,
-                com.google.datastore.v1.Entity.Builder,
-                com.google.datastore.v1.EntityOrBuilder>(
-                (com.google.datastore.v1.Entity) operation_, getParentForChildren(), isClean());
+        insertBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>(
+                (com.google.datastore.v1.Entity) operation_,
+                getParentForChildren(),
+                isClean());
         operation_ = null;
       }
       operationCase_ = 4;
-      onChanged();
-      ;
+      onChanged();;
       return insertBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity,
-            com.google.datastore.v1.Entity.Builder,
-            com.google.datastore.v1.EntityOrBuilder>
-        updateBuilder_;
+        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> updateBuilder_;
     /**
-     *
-     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
      * 

      *
      * .google.datastore.v1.Entity update = 5;
-     *
      * @return Whether the update field is set.
      */
     public boolean hasUpdate() {
       return operationCase_ == 5;
     }
     /**
-     *
-     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
      * 

      *
      * .google.datastore.v1.Entity update = 5;
-     *
      * @return The update.
      */
     public com.google.datastore.v1.Entity getUpdate() {
@@ -1238,8 +1135,6 @@ public com.google.datastore.v1.Entity getUpdate() {
       }
     }
     /**
-     *
-     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1261,8 +1156,6 @@ public Builder setUpdate(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1270,7 +1163,8 @@ public Builder setUpdate(com.google.datastore.v1.Entity value) {
      *
      * .google.datastore.v1.Entity update = 5;
      */
-    public Builder setUpdate(com.google.datastore.v1.Entity.Builder builderForValue) {
+    public Builder setUpdate(
+        com.google.datastore.v1.Entity.Builder builderForValue) {
       if (updateBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -1281,8 +1175,6 @@ public Builder setUpdate(com.google.datastore.v1.Entity.Builder builderForValue)
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1292,12 +1184,10 @@ public Builder setUpdate(com.google.datastore.v1.Entity.Builder builderForValue)
      */
     public Builder mergeUpdate(com.google.datastore.v1.Entity value) {
       if (updateBuilder_ == null) {
-        if (operationCase_ == 5
-            && operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
-          operation_ =
-              com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (operationCase_ == 5 &&
+            operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
+          operation_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
+              .mergeFrom(value).buildPartial();
         } else {
           operation_ = value;
         }
@@ -1312,8 +1202,6 @@ public Builder mergeUpdate(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1338,8 +1226,6 @@ public Builder clearUpdate() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1351,8 +1237,6 @@ public com.google.datastore.v1.Entity.Builder getUpdateBuilder() {
       return getUpdateFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1371,8 +1255,6 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * The entity to update. The entity must already exist.
      * Must have a complete key path.
@@ -1381,58 +1263,45 @@ public com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder() {
      * .google.datastore.v1.Entity update = 5;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity,
-            com.google.datastore.v1.Entity.Builder,
-            com.google.datastore.v1.EntityOrBuilder>
+        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> 
         getUpdateFieldBuilder() {
       if (updateBuilder_ == null) {
         if (!(operationCase_ == 5)) {
           operation_ = com.google.datastore.v1.Entity.getDefaultInstance();
         }
-        updateBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Entity,
-                com.google.datastore.v1.Entity.Builder,
-                com.google.datastore.v1.EntityOrBuilder>(
-                (com.google.datastore.v1.Entity) operation_, getParentForChildren(), isClean());
+        updateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>(
+                (com.google.datastore.v1.Entity) operation_,
+                getParentForChildren(),
+                isClean());
         operation_ = null;
       }
       operationCase_ = 5;
-      onChanged();
-      ;
+      onChanged();;
       return updateBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity,
-            com.google.datastore.v1.Entity.Builder,
-            com.google.datastore.v1.EntityOrBuilder>
-        upsertBuilder_;
+        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> upsertBuilder_;
     /**
-     *
-     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
      * 

      *
      * .google.datastore.v1.Entity upsert = 6;
-     *
      * @return Whether the upsert field is set.
      */
     public boolean hasUpsert() {
       return operationCase_ == 6;
     }
     /**
-     *
-     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
      * 

      *
      * .google.datastore.v1.Entity upsert = 6;
-     *
      * @return The upsert.
      */
     public com.google.datastore.v1.Entity getUpsert() {
@@ -1449,8 +1318,6 @@ public com.google.datastore.v1.Entity getUpsert() {
       }
     }
     /**
-     *
-     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1472,8 +1339,6 @@ public Builder setUpsert(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1481,7 +1346,8 @@ public Builder setUpsert(com.google.datastore.v1.Entity value) {
      *
      * .google.datastore.v1.Entity upsert = 6;
      */
-    public Builder setUpsert(com.google.datastore.v1.Entity.Builder builderForValue) {
+    public Builder setUpsert(
+        com.google.datastore.v1.Entity.Builder builderForValue) {
       if (upsertBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -1492,8 +1358,6 @@ public Builder setUpsert(com.google.datastore.v1.Entity.Builder builderForValue)
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1503,12 +1367,10 @@ public Builder setUpsert(com.google.datastore.v1.Entity.Builder builderForValue)
      */
     public Builder mergeUpsert(com.google.datastore.v1.Entity value) {
       if (upsertBuilder_ == null) {
-        if (operationCase_ == 6
-            && operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
-          operation_ =
-              com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (operationCase_ == 6 &&
+            operation_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
+          operation_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) operation_)
+              .mergeFrom(value).buildPartial();
         } else {
           operation_ = value;
         }
@@ -1523,8 +1385,6 @@ public Builder mergeUpsert(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1549,8 +1409,6 @@ public Builder clearUpsert() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1562,8 +1420,6 @@ public com.google.datastore.v1.Entity.Builder getUpsertBuilder() {
       return getUpsertFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1582,8 +1438,6 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * The entity to upsert. The entity may or may not already exist.
      * The entity key's final path element may be incomplete.
@@ -1592,58 +1446,45 @@ public com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder() {
      * .google.datastore.v1.Entity upsert = 6;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity,
-            com.google.datastore.v1.Entity.Builder,
-            com.google.datastore.v1.EntityOrBuilder>
+        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> 
         getUpsertFieldBuilder() {
       if (upsertBuilder_ == null) {
         if (!(operationCase_ == 6)) {
           operation_ = com.google.datastore.v1.Entity.getDefaultInstance();
         }
-        upsertBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Entity,
-                com.google.datastore.v1.Entity.Builder,
-                com.google.datastore.v1.EntityOrBuilder>(
-                (com.google.datastore.v1.Entity) operation_, getParentForChildren(), isClean());
+        upsertBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>(
+                (com.google.datastore.v1.Entity) operation_,
+                getParentForChildren(),
+                isClean());
         operation_ = null;
       }
       operationCase_ = 6;
-      onChanged();
-      ;
+      onChanged();;
       return upsertBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
-        deleteBuilder_;
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> deleteBuilder_;
     /**
-     *
-     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
      * 

      *
      * .google.datastore.v1.Key delete = 7;
-     *
      * @return Whether the delete field is set.
      */
     public boolean hasDelete() {
       return operationCase_ == 7;
     }
     /**
-     *
-     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
      * 

      *
      * .google.datastore.v1.Key delete = 7;
-     *
      * @return The delete.
      */
     public com.google.datastore.v1.Key getDelete() {
@@ -1660,8 +1501,6 @@ public com.google.datastore.v1.Key getDelete() {
       }
     }
     /**
-     *
-     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1683,8 +1522,6 @@ public Builder setDelete(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1692,7 +1529,8 @@ public Builder setDelete(com.google.datastore.v1.Key value) {
      *
      * .google.datastore.v1.Key delete = 7;
      */
-    public Builder setDelete(com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setDelete(
+        com.google.datastore.v1.Key.Builder builderForValue) {
       if (deleteBuilder_ == null) {
         operation_ = builderForValue.build();
         onChanged();
@@ -1703,8 +1541,6 @@ public Builder setDelete(com.google.datastore.v1.Key.Builder builderForValue) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1714,11 +1550,10 @@ public Builder setDelete(com.google.datastore.v1.Key.Builder builderForValue) {
      */
     public Builder mergeDelete(com.google.datastore.v1.Key value) {
       if (deleteBuilder_ == null) {
-        if (operationCase_ == 7 && operation_ != com.google.datastore.v1.Key.getDefaultInstance()) {
-          operation_ =
-              com.google.datastore.v1.Key.newBuilder((com.google.datastore.v1.Key) operation_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (operationCase_ == 7 &&
+            operation_ != com.google.datastore.v1.Key.getDefaultInstance()) {
+          operation_ = com.google.datastore.v1.Key.newBuilder((com.google.datastore.v1.Key) operation_)
+              .mergeFrom(value).buildPartial();
         } else {
           operation_ = value;
         }
@@ -1733,8 +1568,6 @@ public Builder mergeDelete(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1759,8 +1592,6 @@ public Builder clearDelete() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1772,8 +1603,6 @@ public com.google.datastore.v1.Key.Builder getDeleteBuilder() {
       return getDeleteFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1792,8 +1621,6 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * The key of the entity to delete. The entity may or may not already exist.
      * Must have a complete key path and must not be reserved/read-only.
@@ -1802,38 +1629,31 @@ public com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder() {
      * .google.datastore.v1.Key delete = 7;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
         getDeleteFieldBuilder() {
       if (deleteBuilder_ == null) {
         if (!(operationCase_ == 7)) {
           operation_ = com.google.datastore.v1.Key.getDefaultInstance();
         }
-        deleteBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Key,
-                com.google.datastore.v1.Key.Builder,
-                com.google.datastore.v1.KeyOrBuilder>(
-                (com.google.datastore.v1.Key) operation_, getParentForChildren(), isClean());
+        deleteBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+                (com.google.datastore.v1.Key) operation_,
+                getParentForChildren(),
+                isClean());
         operation_ = null;
       }
       operationCase_ = 7;
-      onChanged();
-      ;
+      onChanged();;
       return deleteBuilder_;
     }
 
     /**
-     *
-     *
      * 
      * The version of the entity that this mutation is being applied to. If this
      * does not match the current version on the server, the mutation conflicts.
      * 

      *
      * int64 base_version = 8;
-     *
      * @return The baseVersion.
      */
     public long getBaseVersion() {
@@ -1843,15 +1663,12 @@ public long getBaseVersion() {
       return 0L;
     }
     /**
-     *
-     *
      * 
      * The version of the entity that this mutation is being applied to. If this
      * does not match the current version on the server, the mutation conflicts.
      * 

      *
      * int64 base_version = 8;
-     *
      * @param value The baseVersion to set.
      * @return This builder for chaining.
      */
@@ -1862,15 +1679,12 @@ public Builder setBaseVersion(long value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The version of the entity that this mutation is being applied to. If this
      * does not match the current version on the server, the mutation conflicts.
      * 

      *
      * int64 base_version = 8;
-     *
      * @return This builder for chaining.
      */
     public Builder clearBaseVersion() {
@@ -1881,9 +1695,9 @@ public Builder clearBaseVersion() {
       }
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1893,12 +1707,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Mutation)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Mutation)
   private static final com.google.datastore.v1.Mutation DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Mutation();
   }
@@ -1907,16 +1721,16 @@ public static com.google.datastore.v1.Mutation getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public Mutation parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Mutation(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public Mutation parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Mutation(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1931,4 +1745,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Mutation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java
index 2957934ae..96eb9a282 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationOrBuilder.java
@@ -18,40 +18,31 @@
 
 package com.google.datastore.v1;
 
-public interface MutationOrBuilder
-    extends
+public interface MutationOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Mutation)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
    * 

    *
    * .google.datastore.v1.Entity insert = 4;
-   *
    * @return Whether the insert field is set.
    */
   boolean hasInsert();
   /**
-   *
-   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
    * 

    *
    * .google.datastore.v1.Entity insert = 4;
-   *
    * @return The insert.
    */
   com.google.datastore.v1.Entity getInsert();
   /**
-   *
-   *
    * 
    * The entity to insert. The entity must not already exist.
    * The entity key's final path element may be incomplete.
@@ -62,34 +53,26 @@ public interface MutationOrBuilder
   com.google.datastore.v1.EntityOrBuilder getInsertOrBuilder();
 
   /**
-   *
-   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
    * 

    *
    * .google.datastore.v1.Entity update = 5;
-   *
    * @return Whether the update field is set.
    */
   boolean hasUpdate();
   /**
-   *
-   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
    * 

    *
    * .google.datastore.v1.Entity update = 5;
-   *
    * @return The update.
    */
   com.google.datastore.v1.Entity getUpdate();
   /**
-   *
-   *
    * 
    * The entity to update. The entity must already exist.
    * Must have a complete key path.
@@ -100,34 +83,26 @@ public interface MutationOrBuilder
   com.google.datastore.v1.EntityOrBuilder getUpdateOrBuilder();
 
   /**
-   *
-   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
    * 

    *
    * .google.datastore.v1.Entity upsert = 6;
-   *
    * @return Whether the upsert field is set.
    */
   boolean hasUpsert();
   /**
-   *
-   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
    * 

    *
    * .google.datastore.v1.Entity upsert = 6;
-   *
    * @return The upsert.
    */
   com.google.datastore.v1.Entity getUpsert();
   /**
-   *
-   *
    * 
    * The entity to upsert. The entity may or may not already exist.
    * The entity key's final path element may be incomplete.
@@ -138,34 +113,26 @@ public interface MutationOrBuilder
   com.google.datastore.v1.EntityOrBuilder getUpsertOrBuilder();
 
   /**
-   *
-   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
    * 

    *
    * .google.datastore.v1.Key delete = 7;
-   *
    * @return Whether the delete field is set.
    */
   boolean hasDelete();
   /**
-   *
-   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
    * 

    *
    * .google.datastore.v1.Key delete = 7;
-   *
    * @return The delete.
    */
   com.google.datastore.v1.Key getDelete();
   /**
-   *
-   *
    * 
    * The key of the entity to delete. The entity may or may not already exist.
    * Must have a complete key path and must not be reserved/read-only.
@@ -176,21 +143,17 @@ public interface MutationOrBuilder
   com.google.datastore.v1.KeyOrBuilder getDeleteOrBuilder();
 
   /**
-   *
-   *
    * 
    * The version of the entity that this mutation is being applied to. If this
    * does not match the current version on the server, the mutation conflicts.
    * 

    *
    * int64 base_version = 8;
-   *
    * @return The baseVersion.
    */
   long getBaseVersion();
 
   public com.google.datastore.v1.Mutation.OperationCase getOperationCase();
 
-  public com.google.datastore.v1.Mutation.ConflictDetectionStrategyCase
-      getConflictDetectionStrategyCase();
+  public com.google.datastore.v1.Mutation.ConflictDetectionStrategyCase getConflictDetectionStrategyCase();
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java
index 061767594..ee3d0be66 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java
@@ -19,37 +19,36 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The result of applying a mutation.
  * 

  *
  * Protobuf type {@code google.datastore.v1.MutationResult}
  */
-public final class MutationResult extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class MutationResult extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.MutationResult)
     MutationResultOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use MutationResult.newBuilder() to construct.
   private MutationResult(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private MutationResult() {}
+  private MutationResult() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new MutationResult();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private MutationResult(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -68,99 +67,88 @@ private MutationResult(
           case 0:
             done = true;
             break;
-          case 26:
-            {
-              com.google.datastore.v1.Key.Builder subBuilder = null;
-              if (key_ != null) {
-                subBuilder = key_.toBuilder();
-              }
-              key_ = input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(key_);
-                key_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-          case 32:
-            {
-              version_ = input.readInt64();
-              break;
+          case 26: {
+            com.google.datastore.v1.Key.Builder subBuilder = null;
+            if (key_ != null) {
+              subBuilder = key_.toBuilder();
             }
-          case 40:
-            {
-              conflictDetected_ = input.readBool();
-              break;
+            key_ = input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(key_);
+              key_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+
+            break;
+          }
+          case 32: {
+
+            version_ = input.readInt64();
+            break;
+          }
+          case 40: {
+
+            conflictDetected_ = input.readBool();
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_MutationResult_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_MutationResult_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.MutationResult.class,
-            com.google.datastore.v1.MutationResult.Builder.class);
+            com.google.datastore.v1.MutationResult.class, com.google.datastore.v1.MutationResult.Builder.class);
   }
 
   public static final int KEY_FIELD_NUMBER = 3;
   private com.google.datastore.v1.Key key_;
   /**
-   *
-   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
    * 

    *
    * .google.datastore.v1.Key key = 3;
-   *
    * @return Whether the key field is set.
    */
   public boolean hasKey() {
     return key_ != null;
   }
   /**
-   *
-   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
    * 

    *
    * .google.datastore.v1.Key key = 3;
-   *
    * @return The key.
    */
   public com.google.datastore.v1.Key getKey() {
     return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
   }
   /**
-   *
-   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
@@ -175,8 +163,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
   public static final int VERSION_FIELD_NUMBER = 4;
   private long version_;
   /**
-   *
-   *
    * 
    * The version of the entity on the server after processing the mutation. If
    * the mutation doesn't change anything on the server, then the version will
@@ -186,7 +172,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
    * 

    *
    * int64 version = 4;
-   *
    * @return The version.
    */
   public long getVersion() {
@@ -196,15 +181,12 @@ public long getVersion() {
   public static final int CONFLICT_DETECTED_FIELD_NUMBER = 5;
   private boolean conflictDetected_;
   /**
-   *
-   *
    * 
    * Whether a conflict was detected for this mutation. Always false when a
    * conflict detection strategy field is not set in the mutation.
    * 

    *
    * bool conflict_detected = 5;
-   *
    * @return The conflictDetected.
    */
   public boolean getConflictDetected() {
@@ -212,7 +194,6 @@ public boolean getConflictDetected() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -224,7 +205,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (key_ != null) {
       output.writeMessage(3, getKey());
     }
@@ -244,13 +226,16 @@ public int getSerializedSize() {
 
     size = 0;
     if (key_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getKey());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, getKey());
     }
     if (version_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream.computeInt64Size(4, version_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(4, version_);
     }
     if (conflictDetected_ != false) {
-      size += com.google.protobuf.CodedOutputStream.computeBoolSize(5, conflictDetected_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(5, conflictDetected_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -260,7 +245,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.MutationResult)) {
       return super.equals(obj);
@@ -269,10 +254,13 @@ public boolean equals(final java.lang.Object obj) {
 
     if (hasKey() != other.hasKey()) return false;
     if (hasKey()) {
-      if (!getKey().equals(other.getKey())) return false;
+      if (!getKey()
+          .equals(other.getKey())) return false;
     }
-    if (getVersion() != other.getVersion()) return false;
-    if (getConflictDetected() != other.getConflictDetected()) return false;
+    if (getVersion()
+        != other.getVersion()) return false;
+    if (getConflictDetected()
+        != other.getConflictDetected()) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -289,135 +277,128 @@ public int hashCode() {
       hash = (53 * hash) + getKey().hashCode();
     }
     hash = (37 * hash) + VERSION_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getVersion());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getVersion());
     hash = (37 * hash) + CONFLICT_DETECTED_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getConflictDetected());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getConflictDetected());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
 
-  public static com.google.datastore.v1.MutationResult parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.MutationResult parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.MutationResult parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.MutationResult parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.MutationResult parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.MutationResult parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.MutationResult parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.MutationResult parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.MutationResult parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.MutationResult parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.MutationResult parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.MutationResult parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.MutationResult parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.MutationResult prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The result of applying a mutation.
    * 

    *
    * Protobuf type {@code google.datastore.v1.MutationResult}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.MutationResult)
       com.google.datastore.v1.MutationResultOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_MutationResult_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_MutationResult_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.MutationResult.class,
-              com.google.datastore.v1.MutationResult.Builder.class);
+              com.google.datastore.v1.MutationResult.class, com.google.datastore.v1.MutationResult.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.MutationResult.newBuilder()
@@ -425,15 +406,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -451,9 +433,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_MutationResult_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor;
     }
 
     @java.lang.Override
@@ -472,8 +454,7 @@ public com.google.datastore.v1.MutationResult build() {
 
     @java.lang.Override
     public com.google.datastore.v1.MutationResult buildPartial() {
-      com.google.datastore.v1.MutationResult result =
-          new com.google.datastore.v1.MutationResult(this);
+      com.google.datastore.v1.MutationResult result = new com.google.datastore.v1.MutationResult(this);
       if (keyBuilder_ == null) {
         result.key_ = key_;
       } else {
@@ -489,39 +470,38 @@ public com.google.datastore.v1.MutationResult buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.MutationResult) {
-        return mergeFrom((com.google.datastore.v1.MutationResult) other);
+        return mergeFrom((com.google.datastore.v1.MutationResult)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -570,35 +550,26 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.Key key_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
-        keyBuilder_;
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyBuilder_;
     /**
-     *
-     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
      * 

      *
      * .google.datastore.v1.Key key = 3;
-     *
      * @return Whether the key field is set.
      */
     public boolean hasKey() {
       return keyBuilder_ != null || key_ != null;
     }
     /**
-     *
-     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
      * 

      *
      * .google.datastore.v1.Key key = 3;
-     *
      * @return The key.
      */
     public com.google.datastore.v1.Key getKey() {
@@ -609,8 +580,6 @@ public com.google.datastore.v1.Key getKey() {
       }
     }
     /**
-     *
-     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -632,8 +601,6 @@ public Builder setKey(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -641,7 +608,8 @@ public Builder setKey(com.google.datastore.v1.Key value) {
      *
      * .google.datastore.v1.Key key = 3;
      */
-    public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKey(
+        com.google.datastore.v1.Key.Builder builderForValue) {
       if (keyBuilder_ == null) {
         key_ = builderForValue.build();
         onChanged();
@@ -652,8 +620,6 @@ public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -664,7 +630,8 @@ public Builder setKey(com.google.datastore.v1.Key.Builder builderForValue) {
     public Builder mergeKey(com.google.datastore.v1.Key value) {
       if (keyBuilder_ == null) {
         if (key_ != null) {
-          key_ = com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial();
+          key_ =
+            com.google.datastore.v1.Key.newBuilder(key_).mergeFrom(value).buildPartial();
         } else {
           key_ = value;
         }
@@ -676,8 +643,6 @@ public Builder mergeKey(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -697,8 +662,6 @@ public Builder clearKey() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -707,13 +670,11 @@ public Builder clearKey() {
      * .google.datastore.v1.Key key = 3;
      */
     public com.google.datastore.v1.Key.Builder getKeyBuilder() {
-
+      
       onChanged();
       return getKeyFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -725,12 +686,11 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
       if (keyBuilder_ != null) {
         return keyBuilder_.getMessageOrBuilder();
       } else {
-        return key_ == null ? com.google.datastore.v1.Key.getDefaultInstance() : key_;
+        return key_ == null ?
+            com.google.datastore.v1.Key.getDefaultInstance() : key_;
       }
     }
     /**
-     *
-     *
      * 
      * The automatically allocated key.
      * Set only when the mutation allocated a key.
@@ -739,25 +699,21 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
      * .google.datastore.v1.Key key = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
         getKeyFieldBuilder() {
       if (keyBuilder_ == null) {
-        keyBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Key,
-                com.google.datastore.v1.Key.Builder,
-                com.google.datastore.v1.KeyOrBuilder>(getKey(), getParentForChildren(), isClean());
+        keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+                getKey(),
+                getParentForChildren(),
+                isClean());
         key_ = null;
       }
       return keyBuilder_;
     }
 
-    private long version_;
+    private long version_ ;
     /**
-     *
-     *
      * 
      * The version of the entity on the server after processing the mutation. If
      * the mutation doesn't change anything on the server, then the version will
@@ -767,15 +723,12 @@ public com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder() {
      * 

      *
      * int64 version = 4;
-     *
      * @return The version.
      */
     public long getVersion() {
       return version_;
     }
     /**
-     *
-     *
      * 
      * The version of the entity on the server after processing the mutation. If
      * the mutation doesn't change anything on the server, then the version will
@@ -785,19 +738,16 @@ public long getVersion() {
      * 

      *
      * int64 version = 4;
-     *
      * @param value The version to set.
      * @return This builder for chaining.
      */
     public Builder setVersion(long value) {
-
+      
       version_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The version of the entity on the server after processing the mutation. If
      * the mutation doesn't change anything on the server, then the version will
@@ -807,72 +757,62 @@ public Builder setVersion(long value) {
      * 

      *
      * int64 version = 4;
-     *
      * @return This builder for chaining.
      */
     public Builder clearVersion() {
-
+      
       version_ = 0L;
       onChanged();
       return this;
     }
 
-    private boolean conflictDetected_;
+    private boolean conflictDetected_ ;
     /**
-     *
-     *
      * 
      * Whether a conflict was detected for this mutation. Always false when a
      * conflict detection strategy field is not set in the mutation.
      * 

      *
      * bool conflict_detected = 5;
-     *
      * @return The conflictDetected.
      */
     public boolean getConflictDetected() {
       return conflictDetected_;
     }
     /**
-     *
-     *
      * 
      * Whether a conflict was detected for this mutation. Always false when a
      * conflict detection strategy field is not set in the mutation.
      * 

      *
      * bool conflict_detected = 5;
-     *
      * @param value The conflictDetected to set.
      * @return This builder for chaining.
      */
     public Builder setConflictDetected(boolean value) {
-
+      
       conflictDetected_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Whether a conflict was detected for this mutation. Always false when a
      * conflict detection strategy field is not set in the mutation.
      * 

      *
      * bool conflict_detected = 5;
-     *
      * @return This builder for chaining.
      */
     public Builder clearConflictDetected() {
-
+      
       conflictDetected_ = false;
       onChanged();
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -882,12 +822,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.MutationResult)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.MutationResult)
   private static final com.google.datastore.v1.MutationResult DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.MutationResult();
   }
@@ -896,16 +836,16 @@ public static com.google.datastore.v1.MutationResult getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public MutationResult parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new MutationResult(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public MutationResult parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new MutationResult(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -920,4 +860,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.MutationResult getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
index 9d330b494..43a0b6fff 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResultOrBuilder.java
@@ -18,40 +18,31 @@
 
 package com.google.datastore.v1;
 
-public interface MutationResultOrBuilder
-    extends
+public interface MutationResultOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.MutationResult)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
    * 

    *
    * .google.datastore.v1.Key key = 3;
-   *
    * @return Whether the key field is set.
    */
   boolean hasKey();
   /**
-   *
-   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
    * 

    *
    * .google.datastore.v1.Key key = 3;
-   *
    * @return The key.
    */
   com.google.datastore.v1.Key getKey();
   /**
-   *
-   *
    * 
    * The automatically allocated key.
    * Set only when the mutation allocated a key.
@@ -62,8 +53,6 @@ public interface MutationResultOrBuilder
   com.google.datastore.v1.KeyOrBuilder getKeyOrBuilder();
 
   /**
-   *
-   *
    * 
    * The version of the entity on the server after processing the mutation. If
    * the mutation doesn't change anything on the server, then the version will
@@ -73,21 +62,17 @@ public interface MutationResultOrBuilder
    * 

    *
    * int64 version = 4;
-   *
    * @return The version.
    */
   long getVersion();
 
   /**
-   *
-   *
    * 
    * Whether a conflict was detected for this mutation. Always false when a
    * conflict detection strategy field is not set in the mutation.
    * 

    *
    * bool conflict_detected = 5;
-   *
    * @return The conflictDetected.
    */
   boolean getConflictDetected();
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
index 8dd325642..daafd037e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
@@ -19,8 +19,6 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A partition ID identifies a grouping of entities. The grouping is always
  * by project and namespace, however the namespace ID may be empty.
@@ -42,16 +40,15 @@
  *
  * Protobuf type {@code google.datastore.v1.PartitionId}
  */
-public final class PartitionId extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class PartitionId extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PartitionId)
     PartitionIdOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use PartitionId.newBuilder() to construct.
   private PartitionId(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private PartitionId() {
     projectId_ = "";
     namespaceId_ = "";
@@ -59,15 +56,16 @@ private PartitionId() {
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new PartitionId();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private PartitionId(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -86,65 +84,58 @@ private PartitionId(
           case 0:
             done = true;
             break;
-          case 18:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              projectId_ = s;
-              break;
-            }
-          case 34:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+            projectId_ = s;
+            break;
+          }
+          case 34: {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              namespaceId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            namespaceId_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.EntityProto
-        .internal_static_google_datastore_v1_PartitionId_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.EntityProto
-        .internal_static_google_datastore_v1_PartitionId_fieldAccessorTable
+    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.PartitionId.class,
-            com.google.datastore.v1.PartitionId.Builder.class);
+            com.google.datastore.v1.PartitionId.class, com.google.datastore.v1.PartitionId.Builder.class);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 2;
   private volatile java.lang.Object projectId_;
   /**
-   *
-   *
    * 
    * The ID of the project to which the entities belong.
    * 

    *
    * string project_id = 2;
-   *
    * @return The projectId.
    */
   public java.lang.String getProjectId() {
@@ -152,28 +143,28 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * The ID of the project to which the entities belong.
    * 

    *
    * string project_id = 2;
-   *
    * @return The bytes for projectId.
    */
-  public com.google.protobuf.ByteString getProjectIdBytes() {
+  public com.google.protobuf.ByteString
+      getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -184,14 +175,11 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   public static final int NAMESPACE_ID_FIELD_NUMBER = 4;
   private volatile java.lang.Object namespaceId_;
   /**
-   *
-   *
    * 
    * If not empty, the ID of the namespace to which the entities belong.
    * 

    *
    * string namespace_id = 4;
-   *
    * @return The namespaceId.
    */
   public java.lang.String getNamespaceId() {
@@ -199,28 +187,28 @@ public java.lang.String getNamespaceId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       namespaceId_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * If not empty, the ID of the namespace to which the entities belong.
    * 

    *
    * string namespace_id = 4;
-   *
    * @return The bytes for namespaceId.
    */
-  public com.google.protobuf.ByteString getNamespaceIdBytes() {
+  public com.google.protobuf.ByteString
+      getNamespaceIdBytes() {
     java.lang.Object ref = namespaceId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       namespaceId_ = b;
       return b;
     } else {
@@ -229,7 +217,6 @@ public com.google.protobuf.ByteString getNamespaceIdBytes() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -241,7 +228,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, projectId_);
     }
@@ -271,15 +259,17 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.PartitionId)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.PartitionId other = (com.google.datastore.v1.PartitionId) obj;
 
-    if (!getProjectId().equals(other.getProjectId())) return false;
-    if (!getNamespaceId().equals(other.getNamespaceId())) return false;
+    if (!getProjectId()
+        .equals(other.getProjectId())) return false;
+    if (!getNamespaceId()
+        .equals(other.getNamespaceId())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -300,103 +290,97 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.PartitionId parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.PartitionId parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PartitionId parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.PartitionId parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.PartitionId parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PartitionId parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PartitionId parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PartitionId parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PartitionId parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PartitionId parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PartitionId parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PartitionId parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PartitionId parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PartitionId parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.PartitionId prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A partition ID identifies a grouping of entities. The grouping is always
    * by project and namespace, however the namespace ID may be empty.
@@ -418,23 +402,21 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * Protobuf type {@code google.datastore.v1.PartitionId}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.PartitionId)
       com.google.datastore.v1.PartitionIdOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_PartitionId_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_PartitionId_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.PartitionId.class,
-              com.google.datastore.v1.PartitionId.Builder.class);
+              com.google.datastore.v1.PartitionId.class, com.google.datastore.v1.PartitionId.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.PartitionId.newBuilder()
@@ -442,15 +424,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -462,9 +445,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_PartitionId_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor;
     }
 
     @java.lang.Override
@@ -494,39 +477,38 @@ public com.google.datastore.v1.PartitionId buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PartitionId) {
-        return mergeFrom((com.google.datastore.v1.PartitionId) other);
+        return mergeFrom((com.google.datastore.v1.PartitionId)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -574,20 +556,18 @@ public Builder mergeFrom(
 
     private java.lang.Object projectId_ = "";
     /**
-     *
-     *
      * 
      * The ID of the project to which the entities belong.
      * 

      *
      * string project_id = 2;
-     *
      * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -596,21 +576,20 @@ public java.lang.String getProjectId() {
       }
     }
     /**
-     *
-     *
      * 
      * The ID of the project to which the entities belong.
      * 

      *
      * string project_id = 2;
-     *
      * @return The bytes for projectId.
      */
-    public com.google.protobuf.ByteString getProjectIdBytes() {
+    public com.google.protobuf.ByteString
+        getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -618,61 +597,54 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * The ID of the project to which the entities belong.
      * 

      *
      * string project_id = 2;
-     *
      * @param value The projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectId(java.lang.String value) {
+    public Builder setProjectId(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The ID of the project to which the entities belong.
      * 

      *
      * string project_id = 2;
-     *
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
+      
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The ID of the project to which the entities belong.
      * 

      *
      * string project_id = 2;
-     *
      * @param value The bytes for projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       projectId_ = value;
       onChanged();
       return this;
@@ -680,20 +652,18 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
 
     private java.lang.Object namespaceId_ = "";
     /**
-     *
-     *
      * 
      * If not empty, the ID of the namespace to which the entities belong.
      * 

      *
      * string namespace_id = 4;
-     *
      * @return The namespaceId.
      */
     public java.lang.String getNamespaceId() {
       java.lang.Object ref = namespaceId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         namespaceId_ = s;
         return s;
@@ -702,21 +672,20 @@ public java.lang.String getNamespaceId() {
       }
     }
     /**
-     *
-     *
      * 
      * If not empty, the ID of the namespace to which the entities belong.
      * 

      *
      * string namespace_id = 4;
-     *
      * @return The bytes for namespaceId.
      */
-    public com.google.protobuf.ByteString getNamespaceIdBytes() {
+    public com.google.protobuf.ByteString
+        getNamespaceIdBytes() {
       java.lang.Object ref = namespaceId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         namespaceId_ = b;
         return b;
       } else {
@@ -724,68 +693,61 @@ public com.google.protobuf.ByteString getNamespaceIdBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * If not empty, the ID of the namespace to which the entities belong.
      * 

      *
      * string namespace_id = 4;
-     *
      * @param value The namespaceId to set.
      * @return This builder for chaining.
      */
-    public Builder setNamespaceId(java.lang.String value) {
+    public Builder setNamespaceId(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       namespaceId_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * If not empty, the ID of the namespace to which the entities belong.
      * 

      *
      * string namespace_id = 4;
-     *
      * @return This builder for chaining.
      */
     public Builder clearNamespaceId() {
-
+      
       namespaceId_ = getDefaultInstance().getNamespaceId();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * If not empty, the ID of the namespace to which the entities belong.
      * 

      *
      * string namespace_id = 4;
-     *
      * @param value The bytes for namespaceId to set.
      * @return This builder for chaining.
      */
-    public Builder setNamespaceIdBytes(com.google.protobuf.ByteString value) {
+    public Builder setNamespaceIdBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       namespaceId_ = value;
       onChanged();
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -795,12 +757,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.PartitionId)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.PartitionId)
   private static final com.google.datastore.v1.PartitionId DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.PartitionId();
   }
@@ -809,16 +771,16 @@ public static com.google.datastore.v1.PartitionId getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public PartitionId parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PartitionId(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public PartitionId parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new PartitionId(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -833,4 +795,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.PartitionId getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index f05a034a6..114cd3952 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -18,58 +18,47 @@
 
 package com.google.datastore.v1;
 
-public interface PartitionIdOrBuilder
-    extends
+public interface PartitionIdOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.PartitionId)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The ID of the project to which the entities belong.
    * 

    *
    * string project_id = 2;
-   *
    * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
-   *
-   *
    * 
    * The ID of the project to which the entities belong.
    * 

    *
    * string project_id = 2;
-   *
    * @return The bytes for projectId.
    */
-  com.google.protobuf.ByteString getProjectIdBytes();
+  com.google.protobuf.ByteString
+      getProjectIdBytes();
 
   /**
-   *
-   *
    * 
    * If not empty, the ID of the namespace to which the entities belong.
    * 

    *
    * string namespace_id = 4;
-   *
    * @return The namespaceId.
    */
   java.lang.String getNamespaceId();
   /**
-   *
-   *
    * 
    * If not empty, the ID of the namespace to which the entities belong.
    * 

    *
    * string namespace_id = 4;
-   *
    * @return The bytes for namespaceId.
    */
-  com.google.protobuf.ByteString getNamespaceIdBytes();
+  com.google.protobuf.ByteString
+      getNamespaceIdBytes();
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java
index 7babf6056..0a2f2fe9f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java
@@ -19,37 +19,36 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A representation of a property in a projection.
  * 

  *
  * Protobuf type {@code google.datastore.v1.Projection}
  */
-public final class Projection extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class Projection extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Projection)
     ProjectionOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use Projection.newBuilder() to construct.
   private Projection(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private Projection() {}
+  private Projection() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new Projection();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private Projection(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -68,91 +67,76 @@ private Projection(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
-              if (property_ != null) {
-                subBuilder = property_.toBuilder();
-              }
-              property_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(property_);
-                property_ = subBuilder.buildPartial();
-              }
-
-              break;
+          case 10: {
+            com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
+            if (property_ != null) {
+              subBuilder = property_.toBuilder();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            property_ = input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(property_);
+              property_ = subBuilder.buildPartial();
             }
+
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_Projection_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_Projection_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.Projection.class,
-            com.google.datastore.v1.Projection.Builder.class);
+            com.google.datastore.v1.Projection.class, com.google.datastore.v1.Projection.Builder.class);
   }
 
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
   /**
-   *
-   *
    * 
    * The property to project.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return Whether the property field is set.
    */
   public boolean hasProperty() {
     return property_ != null;
   }
   /**
-   *
-   *
    * 
    * The property to project.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return The property.
    */
   public com.google.datastore.v1.PropertyReference getProperty() {
-    return property_ == null
-        ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
-        : property_;
+    return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
   }
   /**
-   *
-   *
    * 
    * The property to project.
    * 

@@ -164,7 +148,6 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -176,7 +159,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (property_ != null) {
       output.writeMessage(1, getProperty());
     }
@@ -190,7 +174,8 @@ public int getSerializedSize() {
 
     size = 0;
     if (property_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getProperty());
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -200,7 +185,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Projection)) {
       return super.equals(obj);
@@ -209,7 +194,8 @@ public boolean equals(final java.lang.Object obj) {
 
     if (hasProperty() != other.hasProperty()) return false;
     if (hasProperty()) {
-      if (!getProperty().equals(other.getProperty())) return false;
+      if (!getProperty()
+          .equals(other.getProperty())) return false;
     }
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
@@ -231,126 +217,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Projection parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Projection parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Projection parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Projection parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.Projection parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Projection parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Projection parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Projection parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Projection parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Projection parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Projection parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Projection parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Projection parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Projection parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.Projection prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A representation of a property in a projection.
    * 

    *
    * Protobuf type {@code google.datastore.v1.Projection}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Projection)
       com.google.datastore.v1.ProjectionOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_Projection_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_Projection_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.Projection.class,
-              com.google.datastore.v1.Projection.Builder.class);
+              com.google.datastore.v1.Projection.class, com.google.datastore.v1.Projection.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.Projection.newBuilder()
@@ -358,15 +336,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -380,9 +359,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_Projection_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor;
     }
 
     @java.lang.Override
@@ -415,39 +394,38 @@ public com.google.datastore.v1.Projection buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Projection) {
-        return mergeFrom((com.google.datastore.v1.Projection) other);
+        return mergeFrom((com.google.datastore.v1.Projection)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -490,47 +468,34 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.PropertyReference property_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference,
-            com.google.datastore.v1.PropertyReference.Builder,
-            com.google.datastore.v1.PropertyReferenceOrBuilder>
-        propertyBuilder_;
+        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_;
     /**
-     *
-     *
      * 
      * The property to project.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
-     *
      * @return Whether the property field is set.
      */
     public boolean hasProperty() {
       return propertyBuilder_ != null || property_ != null;
     }
     /**
-     *
-     *
      * 
      * The property to project.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
-     *
      * @return The property.
      */
     public com.google.datastore.v1.PropertyReference getProperty() {
       if (propertyBuilder_ == null) {
-        return property_ == null
-            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
-            : property_;
+        return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
       } else {
         return propertyBuilder_.getMessage();
       }
     }
     /**
-     *
-     *
      * 
      * The property to project.
      * 

@@ -551,15 +516,14 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to project.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
      */
-    public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder builderForValue) {
+    public Builder setProperty(
+        com.google.datastore.v1.PropertyReference.Builder builderForValue) {
       if (propertyBuilder_ == null) {
         property_ = builderForValue.build();
         onChanged();
@@ -570,8 +534,6 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to project.
      * 

@@ -582,9 +544,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       if (propertyBuilder_ == null) {
         if (property_ != null) {
           property_ =
-              com.google.datastore.v1.PropertyReference.newBuilder(property_)
-                  .mergeFrom(value)
-                  .buildPartial();
+            com.google.datastore.v1.PropertyReference.newBuilder(property_).mergeFrom(value).buildPartial();
         } else {
           property_ = value;
         }
@@ -596,8 +556,6 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to project.
      * 

@@ -616,8 +574,6 @@ public Builder clearProperty() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to project.
      * 

@@ -625,13 +581,11 @@ public Builder clearProperty() {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
-
+      
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The property to project.
      * 

@@ -642,14 +596,11 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
       if (propertyBuilder_ != null) {
         return propertyBuilder_.getMessageOrBuilder();
       } else {
-        return property_ == null
-            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
-            : property_;
+        return property_ == null ?
+            com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
       }
     }
     /**
-     *
-     *
      * 
      * The property to project.
      * 

@@ -657,24 +608,21 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
      * .google.datastore.v1.PropertyReference property = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference,
-            com.google.datastore.v1.PropertyReference.Builder,
-            com.google.datastore.v1.PropertyReferenceOrBuilder>
+        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> 
         getPropertyFieldBuilder() {
       if (propertyBuilder_ == null) {
-        propertyBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.PropertyReference,
-                com.google.datastore.v1.PropertyReference.Builder,
-                com.google.datastore.v1.PropertyReferenceOrBuilder>(
-                getProperty(), getParentForChildren(), isClean());
+        propertyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>(
+                getProperty(),
+                getParentForChildren(),
+                isClean());
         property_ = null;
       }
       return propertyBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -684,12 +632,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Projection)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Projection)
   private static final com.google.datastore.v1.Projection DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Projection();
   }
@@ -698,16 +646,16 @@ public static com.google.datastore.v1.Projection getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public Projection parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Projection(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public Projection parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Projection(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -722,4 +670,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Projection getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
index dc4b14a5d..5fb6e490e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ProjectionOrBuilder.java
@@ -18,38 +18,29 @@
 
 package com.google.datastore.v1;
 
-public interface ProjectionOrBuilder
-    extends
+public interface ProjectionOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Projection)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The property to project.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return Whether the property field is set.
    */
   boolean hasProperty();
   /**
-   *
-   *
    * 
    * The property to project.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return The property.
    */
   com.google.datastore.v1.PropertyReference getProperty();
   /**
-   *
-   *
    * 
    * The property to project.
    * 

diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java
index 44db5e211..71d4c26f4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java
@@ -19,39 +19,37 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A filter on a specific property.
  * 

  *
  * Protobuf type {@code google.datastore.v1.PropertyFilter}
  */
-public final class PropertyFilter extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class PropertyFilter extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyFilter)
     PropertyFilterOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use PropertyFilter.newBuilder() to construct.
   private PropertyFilter(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private PropertyFilter() {
     op_ = 0;
   }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new PropertyFilter();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private PropertyFilter(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -70,90 +68,80 @@ private PropertyFilter(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
-              if (property_ != null) {
-                subBuilder = property_.toBuilder();
-              }
-              property_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(property_);
-                property_ = subBuilder.buildPartial();
-              }
-
-              break;
+          case 10: {
+            com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
+            if (property_ != null) {
+              subBuilder = property_.toBuilder();
+            }
+            property_ = input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(property_);
+              property_ = subBuilder.buildPartial();
             }
-          case 16:
-            {
-              int rawValue = input.readEnum();
 
-              op_ = rawValue;
-              break;
+            break;
+          }
+          case 16: {
+            int rawValue = input.readEnum();
+
+            op_ = rawValue;
+            break;
+          }
+          case 26: {
+            com.google.datastore.v1.Value.Builder subBuilder = null;
+            if (value_ != null) {
+              subBuilder = value_.toBuilder();
             }
-          case 26:
-            {
-              com.google.datastore.v1.Value.Builder subBuilder = null;
-              if (value_ != null) {
-                subBuilder = value_.toBuilder();
-              }
-              value_ = input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(value_);
-                value_ = subBuilder.buildPartial();
-              }
-
-              break;
+            value_ = input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(value_);
+              value_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_PropertyFilter_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.PropertyFilter.class,
-            com.google.datastore.v1.PropertyFilter.Builder.class);
+            com.google.datastore.v1.PropertyFilter.class, com.google.datastore.v1.PropertyFilter.Builder.class);
   }
 
   /**
-   *
-   *
    * 
    * A property filter operator.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.PropertyFilter.Operator}
    */
-  public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
+  public enum Operator
+      implements com.google.protobuf.ProtocolMessageEnum {
     /**
-     *
-     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -162,8 +150,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     OPERATOR_UNSPECIFIED(0),
     /**
-     *
-     *
      * 
      * Less than.
      * 

@@ -172,8 +158,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     LESS_THAN(1),
     /**
-     *
-     *
      * 
      * Less than or equal.
      * 

@@ -182,8 +166,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     LESS_THAN_OR_EQUAL(2),
     /**
-     *
-     *
      * 
      * Greater than.
      * 

@@ -192,8 +174,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     GREATER_THAN(3),
     /**
-     *
-     *
      * 
      * Greater than or equal.
      * 

@@ -202,8 +182,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     GREATER_THAN_OR_EQUAL(4),
     /**
-     *
-     *
      * 
      * Equal.
      * 

@@ -212,8 +190,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     EQUAL(5),
     /**
-     *
-     *
      * 
      * Has ancestor.
      * 

@@ -225,8 +201,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
     ;
 
     /**
-     *
-     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -235,8 +209,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int OPERATOR_UNSPECIFIED_VALUE = 0;
     /**
-     *
-     *
      * 
      * Less than.
      * 

@@ -245,8 +217,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int LESS_THAN_VALUE = 1;
     /**
-     *
-     *
      * 
      * Less than or equal.
      * 

@@ -255,8 +225,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int LESS_THAN_OR_EQUAL_VALUE = 2;
     /**
-     *
-     *
      * 
      * Greater than.
      * 

@@ -265,8 +233,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int GREATER_THAN_VALUE = 3;
     /**
-     *
-     *
      * 
      * Greater than or equal.
      * 

@@ -275,8 +241,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int GREATER_THAN_OR_EQUAL_VALUE = 4;
     /**
-     *
-     *
      * 
      * Equal.
      * 

@@ -285,8 +249,6 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int EQUAL_VALUE = 5;
     /**
-     *
-     *
      * 
      * Has ancestor.
      * 

@@ -295,6 +257,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int HAS_ANCESTOR_VALUE = 11;
 
+
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -319,53 +282,49 @@ public static Operator valueOf(int value) {
      */
     public static Operator forNumber(int value) {
       switch (value) {
-        case 0:
-          return OPERATOR_UNSPECIFIED;
-        case 1:
-          return LESS_THAN;
-        case 2:
-          return LESS_THAN_OR_EQUAL;
-        case 3:
-          return GREATER_THAN;
-        case 4:
-          return GREATER_THAN_OR_EQUAL;
-        case 5:
-          return EQUAL;
-        case 11:
-          return HAS_ANCESTOR;
-        default:
-          return null;
+        case 0: return OPERATOR_UNSPECIFIED;
+        case 1: return LESS_THAN;
+        case 2: return LESS_THAN_OR_EQUAL;
+        case 3: return GREATER_THAN;
+        case 4: return GREATER_THAN_OR_EQUAL;
+        case 5: return EQUAL;
+        case 11: return HAS_ANCESTOR;
+        default: return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
       return internalValueMap;
     }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        Operator> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public Operator findValueByNumber(int number) {
+              return Operator.forNumber(number);
+            }
+          };
 
-    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap() {
-          public Operator findValueByNumber(int number) {
-            return Operator.forNumber(number);
-          }
-        };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-
-    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
       return getDescriptor();
     }
-
-    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
       return com.google.datastore.v1.PropertyFilter.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final Operator[] VALUES = values();
 
-    public static Operator valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static Operator valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -385,38 +344,28 @@ private Operator(int value) {
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
   /**
-   *
-   *
    * 
    * The property to filter by.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return Whether the property field is set.
    */
   public boolean hasProperty() {
     return property_ != null;
   }
   /**
-   *
-   *
    * 
    * The property to filter by.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return The property.
    */
   public com.google.datastore.v1.PropertyReference getProperty() {
-    return property_ == null
-        ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
-        : property_;
+    return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
   }
   /**
-   *
-   *
    * 
    * The property to filter by.
    * 

@@ -430,70 +379,55 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
   public static final int OP_FIELD_NUMBER = 2;
   private int op_;
   /**
-   *
-   *
    * 
    * The operator to filter by.
    * 

    *
    * .google.datastore.v1.PropertyFilter.Operator op = 2;
-   *
    * @return The enum numeric value on the wire for op.
    */
   public int getOpValue() {
     return op_;
   }
   /**
-   *
-   *
    * 
    * The operator to filter by.
    * 

    *
    * .google.datastore.v1.PropertyFilter.Operator op = 2;
-   *
    * @return The op.
    */
   public com.google.datastore.v1.PropertyFilter.Operator getOp() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.PropertyFilter.Operator result =
-        com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
+    com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
     return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result;
   }
 
   public static final int VALUE_FIELD_NUMBER = 3;
   private com.google.datastore.v1.Value value_;
   /**
-   *
-   *
    * 
    * The value to compare the property to.
    * 

    *
    * .google.datastore.v1.Value value = 3;
-   *
    * @return Whether the value field is set.
    */
   public boolean hasValue() {
     return value_ != null;
   }
   /**
-   *
-   *
    * 
    * The value to compare the property to.
    * 

    *
    * .google.datastore.v1.Value value = 3;
-   *
    * @return The value.
    */
   public com.google.datastore.v1.Value getValue() {
     return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_;
   }
   /**
-   *
-   *
    * 
    * The value to compare the property to.
    * 

@@ -505,7 +439,6 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -517,7 +450,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (property_ != null) {
       output.writeMessage(1, getProperty());
     }
@@ -537,13 +471,16 @@ public int getSerializedSize() {
 
     size = 0;
     if (property_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getProperty());
     }
     if (op_ != com.google.datastore.v1.PropertyFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, op_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(2, op_);
     }
     if (value_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getValue());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, getValue());
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -553,7 +490,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.PropertyFilter)) {
       return super.equals(obj);
@@ -562,12 +499,14 @@ public boolean equals(final java.lang.Object obj) {
 
     if (hasProperty() != other.hasProperty()) return false;
     if (hasProperty()) {
-      if (!getProperty().equals(other.getProperty())) return false;
+      if (!getProperty()
+          .equals(other.getProperty())) return false;
     }
     if (op_ != other.op_) return false;
     if (hasValue() != other.hasValue()) return false;
     if (hasValue()) {
-      if (!getValue().equals(other.getValue())) return false;
+      if (!getValue()
+          .equals(other.getValue())) return false;
     }
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
@@ -595,127 +534,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.PropertyFilter parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.PropertyFilter parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PropertyFilter parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyFilter parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PropertyFilter parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyFilter parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PropertyFilter parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyFilter parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PropertyFilter parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyFilter parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PropertyFilter parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyFilter parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PropertyFilter parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.PropertyFilter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A filter on a specific property.
    * 

    *
    * Protobuf type {@code google.datastore.v1.PropertyFilter}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyFilter)
       com.google.datastore.v1.PropertyFilterOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_PropertyFilter_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.PropertyFilter.class,
-              com.google.datastore.v1.PropertyFilter.Builder.class);
+              com.google.datastore.v1.PropertyFilter.class, com.google.datastore.v1.PropertyFilter.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.PropertyFilter.newBuilder()
@@ -723,15 +653,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -753,9 +684,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_PropertyFilter_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor;
     }
 
     @java.lang.Override
@@ -774,8 +705,7 @@ public com.google.datastore.v1.PropertyFilter build() {
 
     @java.lang.Override
     public com.google.datastore.v1.PropertyFilter buildPartial() {
-      com.google.datastore.v1.PropertyFilter result =
-          new com.google.datastore.v1.PropertyFilter(this);
+      com.google.datastore.v1.PropertyFilter result = new com.google.datastore.v1.PropertyFilter(this);
       if (propertyBuilder_ == null) {
         result.property_ = property_;
       } else {
@@ -795,39 +725,38 @@ public com.google.datastore.v1.PropertyFilter buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PropertyFilter) {
-        return mergeFrom((com.google.datastore.v1.PropertyFilter) other);
+        return mergeFrom((com.google.datastore.v1.PropertyFilter)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -876,47 +805,34 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.PropertyReference property_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference,
-            com.google.datastore.v1.PropertyReference.Builder,
-            com.google.datastore.v1.PropertyReferenceOrBuilder>
-        propertyBuilder_;
+        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_;
     /**
-     *
-     *
      * 
      * The property to filter by.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
-     *
      * @return Whether the property field is set.
      */
     public boolean hasProperty() {
       return propertyBuilder_ != null || property_ != null;
     }
     /**
-     *
-     *
      * 
      * The property to filter by.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
-     *
      * @return The property.
      */
     public com.google.datastore.v1.PropertyReference getProperty() {
       if (propertyBuilder_ == null) {
-        return property_ == null
-            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
-            : property_;
+        return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
       } else {
         return propertyBuilder_.getMessage();
       }
     }
     /**
-     *
-     *
      * 
      * The property to filter by.
      * 

@@ -937,15 +853,14 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to filter by.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
      */
-    public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder builderForValue) {
+    public Builder setProperty(
+        com.google.datastore.v1.PropertyReference.Builder builderForValue) {
       if (propertyBuilder_ == null) {
         property_ = builderForValue.build();
         onChanged();
@@ -956,8 +871,6 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to filter by.
      * 

@@ -968,9 +881,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       if (propertyBuilder_ == null) {
         if (property_ != null) {
           property_ =
-              com.google.datastore.v1.PropertyReference.newBuilder(property_)
-                  .mergeFrom(value)
-                  .buildPartial();
+            com.google.datastore.v1.PropertyReference.newBuilder(property_).mergeFrom(value).buildPartial();
         } else {
           property_ = value;
         }
@@ -982,8 +893,6 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to filter by.
      * 

@@ -1002,8 +911,6 @@ public Builder clearProperty() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to filter by.
      * 

@@ -1011,13 +918,11 @@ public Builder clearProperty() {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
-
+      
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The property to filter by.
      * 

@@ -1028,14 +933,11 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
       if (propertyBuilder_ != null) {
         return propertyBuilder_.getMessageOrBuilder();
       } else {
-        return property_ == null
-            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
-            : property_;
+        return property_ == null ?
+            com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
       }
     }
     /**
-     *
-     *
      * 
      * The property to filter by.
      * 

@@ -1043,17 +945,14 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
      * .google.datastore.v1.PropertyReference property = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference,
-            com.google.datastore.v1.PropertyReference.Builder,
-            com.google.datastore.v1.PropertyReferenceOrBuilder>
+        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> 
         getPropertyFieldBuilder() {
       if (propertyBuilder_ == null) {
-        propertyBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.PropertyReference,
-                com.google.datastore.v1.PropertyReference.Builder,
-                com.google.datastore.v1.PropertyReferenceOrBuilder>(
-                getProperty(), getParentForChildren(), isClean());
+        propertyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>(
+                getProperty(),
+                getParentForChildren(),
+                isClean());
         property_ = null;
       }
       return propertyBuilder_;
@@ -1061,28 +960,22 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
 
     private int op_ = 0;
     /**
-     *
-     *
      * 
      * The operator to filter by.
      * 

      *
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
-     *
      * @return The enum numeric value on the wire for op.
      */
     public int getOpValue() {
       return op_;
     }
     /**
-     *
-     *
      * 
      * The operator to filter by.
      * 

      *
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
-     *
      * @param value The enum numeric value on the wire for op to set.
      * @return This builder for chaining.
      */
@@ -1092,31 +985,24 @@ public Builder setOpValue(int value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The operator to filter by.
      * 

      *
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
-     *
      * @return The op.
      */
     public com.google.datastore.v1.PropertyFilter.Operator getOp() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.PropertyFilter.Operator result =
-          com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
+      com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
       return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result;
     }
     /**
-     *
-     *
      * 
      * The operator to filter by.
      * 

      *
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
-     *
      * @param value The op to set.
      * @return This builder for chaining.
      */
@@ -1124,24 +1010,21 @@ public Builder setOp(com.google.datastore.v1.PropertyFilter.Operator value) {
       if (value == null) {
         throw new NullPointerException();
       }
-
+      
       op_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The operator to filter by.
      * 

      *
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
-     *
      * @return This builder for chaining.
      */
     public Builder clearOp() {
-
+      
       op_ = 0;
       onChanged();
       return this;
@@ -1149,33 +1032,24 @@ public Builder clearOp() {
 
     private com.google.datastore.v1.Value value_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Value,
-            com.google.datastore.v1.Value.Builder,
-            com.google.datastore.v1.ValueOrBuilder>
-        valueBuilder_;
+        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> valueBuilder_;
     /**
-     *
-     *
      * 
      * The value to compare the property to.
      * 

      *
      * .google.datastore.v1.Value value = 3;
-     *
      * @return Whether the value field is set.
      */
     public boolean hasValue() {
       return valueBuilder_ != null || value_ != null;
     }
     /**
-     *
-     *
      * 
      * The value to compare the property to.
      * 

      *
      * .google.datastore.v1.Value value = 3;
-     *
      * @return The value.
      */
     public com.google.datastore.v1.Value getValue() {
@@ -1186,8 +1060,6 @@ public com.google.datastore.v1.Value getValue() {
       }
     }
     /**
-     *
-     *
      * 
      * The value to compare the property to.
      * 

@@ -1208,15 +1080,14 @@ public Builder setValue(com.google.datastore.v1.Value value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The value to compare the property to.
      * 

      *
      * .google.datastore.v1.Value value = 3;
      */
-    public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
+    public Builder setValue(
+        com.google.datastore.v1.Value.Builder builderForValue) {
       if (valueBuilder_ == null) {
         value_ = builderForValue.build();
         onChanged();
@@ -1227,8 +1098,6 @@ public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The value to compare the property to.
      * 

@@ -1238,7 +1107,8 @@ public Builder setValue(com.google.datastore.v1.Value.Builder builderForValue) {
     public Builder mergeValue(com.google.datastore.v1.Value value) {
       if (valueBuilder_ == null) {
         if (value_ != null) {
-          value_ = com.google.datastore.v1.Value.newBuilder(value_).mergeFrom(value).buildPartial();
+          value_ =
+            com.google.datastore.v1.Value.newBuilder(value_).mergeFrom(value).buildPartial();
         } else {
           value_ = value;
         }
@@ -1250,8 +1120,6 @@ public Builder mergeValue(com.google.datastore.v1.Value value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The value to compare the property to.
      * 

@@ -1270,8 +1138,6 @@ public Builder clearValue() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The value to compare the property to.
      * 

@@ -1279,13 +1145,11 @@ public Builder clearValue() {
      * .google.datastore.v1.Value value = 3;
      */
     public com.google.datastore.v1.Value.Builder getValueBuilder() {
-
+      
       onChanged();
       return getValueFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The value to compare the property to.
      * 

@@ -1296,12 +1160,11 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
       if (valueBuilder_ != null) {
         return valueBuilder_.getMessageOrBuilder();
       } else {
-        return value_ == null ? com.google.datastore.v1.Value.getDefaultInstance() : value_;
+        return value_ == null ?
+            com.google.datastore.v1.Value.getDefaultInstance() : value_;
       }
     }
     /**
-     *
-     *
      * 
      * The value to compare the property to.
      * 

@@ -1309,24 +1172,21 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
      * .google.datastore.v1.Value value = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Value,
-            com.google.datastore.v1.Value.Builder,
-            com.google.datastore.v1.ValueOrBuilder>
+        com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder> 
         getValueFieldBuilder() {
       if (valueBuilder_ == null) {
-        valueBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Value,
-                com.google.datastore.v1.Value.Builder,
-                com.google.datastore.v1.ValueOrBuilder>(
-                getValue(), getParentForChildren(), isClean());
+        valueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder>(
+                getValue(),
+                getParentForChildren(),
+                isClean());
         value_ = null;
       }
       return valueBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1336,12 +1196,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyFilter)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyFilter)
   private static final com.google.datastore.v1.PropertyFilter DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyFilter();
   }
@@ -1350,16 +1210,16 @@ public static com.google.datastore.v1.PropertyFilter getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public PropertyFilter parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PropertyFilter(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public PropertyFilter parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new PropertyFilter(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1374,4 +1234,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
index 311c260a6..30b06862d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilterOrBuilder.java
@@ -18,38 +18,29 @@
 
 package com.google.datastore.v1;
 
-public interface PropertyFilterOrBuilder
-    extends
+public interface PropertyFilterOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyFilter)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The property to filter by.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return Whether the property field is set.
    */
   boolean hasProperty();
   /**
-   *
-   *
    * 
    * The property to filter by.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return The property.
    */
   com.google.datastore.v1.PropertyReference getProperty();
   /**
-   *
-   *
    * 
    * The property to filter by.
    * 

@@ -59,57 +50,43 @@ public interface PropertyFilterOrBuilder
   com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder();
 
   /**
-   *
-   *
    * 
    * The operator to filter by.
    * 

    *
    * .google.datastore.v1.PropertyFilter.Operator op = 2;
-   *
    * @return The enum numeric value on the wire for op.
    */
   int getOpValue();
   /**
-   *
-   *
    * 
    * The operator to filter by.
    * 

    *
    * .google.datastore.v1.PropertyFilter.Operator op = 2;
-   *
    * @return The op.
    */
   com.google.datastore.v1.PropertyFilter.Operator getOp();
 
   /**
-   *
-   *
    * 
    * The value to compare the property to.
    * 

    *
    * .google.datastore.v1.Value value = 3;
-   *
    * @return Whether the value field is set.
    */
   boolean hasValue();
   /**
-   *
-   *
    * 
    * The value to compare the property to.
    * 

    *
    * .google.datastore.v1.Value value = 3;
-   *
    * @return The value.
    */
   com.google.datastore.v1.Value getValue();
   /**
-   *
-   *
    * 
    * The value to compare the property to.
    * 

diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java
index 4876eefb5..2fccd9171 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java
@@ -19,39 +19,37 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The desired order for a specific property.
  * 

  *
  * Protobuf type {@code google.datastore.v1.PropertyOrder}
  */
-public final class PropertyOrder extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class PropertyOrder extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyOrder)
     PropertyOrderOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use PropertyOrder.newBuilder() to construct.
   private PropertyOrder(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private PropertyOrder() {
     direction_ = 0;
   }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new PropertyOrder();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private PropertyOrder(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -70,76 +68,67 @@ private PropertyOrder(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
-              if (property_ != null) {
-                subBuilder = property_.toBuilder();
-              }
-              property_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(property_);
-                property_ = subBuilder.buildPartial();
-              }
-
-              break;
+          case 10: {
+            com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
+            if (property_ != null) {
+              subBuilder = property_.toBuilder();
             }
-          case 16:
-            {
-              int rawValue = input.readEnum();
-
-              direction_ = rawValue;
-              break;
+            property_ = input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(property_);
+              property_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+
+            break;
+          }
+          case 16: {
+            int rawValue = input.readEnum();
+
+            direction_ = rawValue;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_PropertyOrder_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.PropertyOrder.class,
-            com.google.datastore.v1.PropertyOrder.Builder.class);
+            com.google.datastore.v1.PropertyOrder.class, com.google.datastore.v1.PropertyOrder.Builder.class);
   }
 
   /**
-   *
-   *
    * 
    * The sort direction.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.PropertyOrder.Direction}
    */
-  public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
+  public enum Direction
+      implements com.google.protobuf.ProtocolMessageEnum {
     /**
-     *
-     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -148,8 +137,6 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
      */
     DIRECTION_UNSPECIFIED(0),
     /**
-     *
-     *
      * 
      * Ascending.
      * 

@@ -158,8 +145,6 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
      */
     ASCENDING(1),
     /**
-     *
-     *
      * 
      * Descending.
      * 

@@ -171,8 +156,6 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
     ;
 
     /**
-     *
-     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -181,8 +164,6 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int DIRECTION_UNSPECIFIED_VALUE = 0;
     /**
-     *
-     *
      * 
      * Ascending.
      * 

@@ -191,8 +172,6 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int ASCENDING_VALUE = 1;
     /**
-     *
-     *
      * 
      * Descending.
      * 

@@ -201,6 +180,7 @@ public enum Direction implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int DESCENDING_VALUE = 2;
 
+
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -225,45 +205,45 @@ public static Direction valueOf(int value) {
      */
     public static Direction forNumber(int value) {
       switch (value) {
-        case 0:
-          return DIRECTION_UNSPECIFIED;
-        case 1:
-          return ASCENDING;
-        case 2:
-          return DESCENDING;
-        default:
-          return null;
+        case 0: return DIRECTION_UNSPECIFIED;
+        case 1: return ASCENDING;
+        case 2: return DESCENDING;
+        default: return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
       return internalValueMap;
     }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        Direction> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public Direction findValueByNumber(int number) {
+              return Direction.forNumber(number);
+            }
+          };
 
-    private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap =
-        new com.google.protobuf.Internal.EnumLiteMap() {
-          public Direction findValueByNumber(int number) {
-            return Direction.forNumber(number);
-          }
-        };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-
-    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
       return getDescriptor();
     }
-
-    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
       return com.google.datastore.v1.PropertyOrder.getDescriptor().getEnumTypes().get(0);
     }
 
     private static final Direction[] VALUES = values();
 
-    public static Direction valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+    public static Direction valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -283,38 +263,28 @@ private Direction(int value) {
   public static final int PROPERTY_FIELD_NUMBER = 1;
   private com.google.datastore.v1.PropertyReference property_;
   /**
-   *
-   *
    * 
    * The property to order by.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return Whether the property field is set.
    */
   public boolean hasProperty() {
     return property_ != null;
   }
   /**
-   *
-   *
    * 
    * The property to order by.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return The property.
    */
   public com.google.datastore.v1.PropertyReference getProperty() {
-    return property_ == null
-        ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
-        : property_;
+    return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
   }
   /**
-   *
-   *
    * 
    * The property to order by.
    * 

@@ -328,39 +298,31 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
   public static final int DIRECTION_FIELD_NUMBER = 2;
   private int direction_;
   /**
-   *
-   *
    * 
    * The direction to order by. Defaults to `ASCENDING`.
    * 

    *
    * .google.datastore.v1.PropertyOrder.Direction direction = 2;
-   *
    * @return The enum numeric value on the wire for direction.
    */
   public int getDirectionValue() {
     return direction_;
   }
   /**
-   *
-   *
    * 
    * The direction to order by. Defaults to `ASCENDING`.
    * 

    *
    * .google.datastore.v1.PropertyOrder.Direction direction = 2;
-   *
    * @return The direction.
    */
   public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.PropertyOrder.Direction result =
-        com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
+    com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
     return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -372,12 +334,12 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (property_ != null) {
       output.writeMessage(1, getProperty());
     }
-    if (direction_
-        != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
+    if (direction_ != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
       output.writeEnum(2, direction_);
     }
     unknownFields.writeTo(output);
@@ -390,11 +352,12 @@ public int getSerializedSize() {
 
     size = 0;
     if (property_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getProperty());
     }
-    if (direction_
-        != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, direction_);
+    if (direction_ != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(2, direction_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -404,7 +367,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.PropertyOrder)) {
       return super.equals(obj);
@@ -413,7 +376,8 @@ public boolean equals(final java.lang.Object obj) {
 
     if (hasProperty() != other.hasProperty()) return false;
     if (hasProperty()) {
-      if (!getProperty().equals(other.getProperty())) return false;
+      if (!getProperty()
+          .equals(other.getProperty())) return false;
     }
     if (direction_ != other.direction_) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
@@ -438,126 +402,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.PropertyOrder parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.PropertyOrder parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PropertyOrder parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.PropertyOrder parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.PropertyOrder parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PropertyOrder parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyOrder parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PropertyOrder parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyOrder parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PropertyOrder parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyOrder parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PropertyOrder parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyOrder parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PropertyOrder parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.PropertyOrder prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The desired order for a specific property.
    * 

    *
    * Protobuf type {@code google.datastore.v1.PropertyOrder}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyOrder)
       com.google.datastore.v1.PropertyOrderOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_PropertyOrder_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.PropertyOrder.class,
-              com.google.datastore.v1.PropertyOrder.Builder.class);
+              com.google.datastore.v1.PropertyOrder.class, com.google.datastore.v1.PropertyOrder.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.PropertyOrder.newBuilder()
@@ -565,15 +521,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -589,9 +546,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_PropertyOrder_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor;
     }
 
     @java.lang.Override
@@ -610,8 +567,7 @@ public com.google.datastore.v1.PropertyOrder build() {
 
     @java.lang.Override
     public com.google.datastore.v1.PropertyOrder buildPartial() {
-      com.google.datastore.v1.PropertyOrder result =
-          new com.google.datastore.v1.PropertyOrder(this);
+      com.google.datastore.v1.PropertyOrder result = new com.google.datastore.v1.PropertyOrder(this);
       if (propertyBuilder_ == null) {
         result.property_ = property_;
       } else {
@@ -626,39 +582,38 @@ public com.google.datastore.v1.PropertyOrder buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PropertyOrder) {
-        return mergeFrom((com.google.datastore.v1.PropertyOrder) other);
+        return mergeFrom((com.google.datastore.v1.PropertyOrder)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -704,47 +659,34 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.PropertyReference property_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference,
-            com.google.datastore.v1.PropertyReference.Builder,
-            com.google.datastore.v1.PropertyReferenceOrBuilder>
-        propertyBuilder_;
+        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> propertyBuilder_;
     /**
-     *
-     *
      * 
      * The property to order by.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
-     *
      * @return Whether the property field is set.
      */
     public boolean hasProperty() {
       return propertyBuilder_ != null || property_ != null;
     }
     /**
-     *
-     *
      * 
      * The property to order by.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
-     *
      * @return The property.
      */
     public com.google.datastore.v1.PropertyReference getProperty() {
       if (propertyBuilder_ == null) {
-        return property_ == null
-            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
-            : property_;
+        return property_ == null ? com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
       } else {
         return propertyBuilder_.getMessage();
       }
     }
     /**
-     *
-     *
      * 
      * The property to order by.
      * 

@@ -765,15 +707,14 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to order by.
      * 

      *
      * .google.datastore.v1.PropertyReference property = 1;
      */
-    public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder builderForValue) {
+    public Builder setProperty(
+        com.google.datastore.v1.PropertyReference.Builder builderForValue) {
       if (propertyBuilder_ == null) {
         property_ = builderForValue.build();
         onChanged();
@@ -784,8 +725,6 @@ public Builder setProperty(com.google.datastore.v1.PropertyReference.Builder bui
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to order by.
      * 

@@ -796,9 +735,7 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       if (propertyBuilder_ == null) {
         if (property_ != null) {
           property_ =
-              com.google.datastore.v1.PropertyReference.newBuilder(property_)
-                  .mergeFrom(value)
-                  .buildPartial();
+            com.google.datastore.v1.PropertyReference.newBuilder(property_).mergeFrom(value).buildPartial();
         } else {
           property_ = value;
         }
@@ -810,8 +747,6 @@ public Builder mergeProperty(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to order by.
      * 

@@ -830,8 +765,6 @@ public Builder clearProperty() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The property to order by.
      * 

@@ -839,13 +772,11 @@ public Builder clearProperty() {
      * .google.datastore.v1.PropertyReference property = 1;
      */
     public com.google.datastore.v1.PropertyReference.Builder getPropertyBuilder() {
-
+      
       onChanged();
       return getPropertyFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The property to order by.
      * 

@@ -856,14 +787,11 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
       if (propertyBuilder_ != null) {
         return propertyBuilder_.getMessageOrBuilder();
       } else {
-        return property_ == null
-            ? com.google.datastore.v1.PropertyReference.getDefaultInstance()
-            : property_;
+        return property_ == null ?
+            com.google.datastore.v1.PropertyReference.getDefaultInstance() : property_;
       }
     }
     /**
-     *
-     *
      * 
      * The property to order by.
      * 

@@ -871,17 +799,14 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
      * .google.datastore.v1.PropertyReference property = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference,
-            com.google.datastore.v1.PropertyReference.Builder,
-            com.google.datastore.v1.PropertyReferenceOrBuilder>
+        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> 
         getPropertyFieldBuilder() {
       if (propertyBuilder_ == null) {
-        propertyBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.PropertyReference,
-                com.google.datastore.v1.PropertyReference.Builder,
-                com.google.datastore.v1.PropertyReferenceOrBuilder>(
-                getProperty(), getParentForChildren(), isClean());
+        propertyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>(
+                getProperty(),
+                getParentForChildren(),
+                isClean());
         property_ = null;
       }
       return propertyBuilder_;
@@ -889,28 +814,22 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
 
     private int direction_ = 0;
     /**
-     *
-     *
      * 
      * The direction to order by. Defaults to `ASCENDING`.
      * 

      *
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
-     *
      * @return The enum numeric value on the wire for direction.
      */
     public int getDirectionValue() {
       return direction_;
     }
     /**
-     *
-     *
      * 
      * The direction to order by. Defaults to `ASCENDING`.
      * 

      *
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
-     *
      * @param value The enum numeric value on the wire for direction to set.
      * @return This builder for chaining.
      */
@@ -920,31 +839,24 @@ public Builder setDirectionValue(int value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The direction to order by. Defaults to `ASCENDING`.
      * 

      *
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
-     *
      * @return The direction.
      */
     public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.PropertyOrder.Direction result =
-          com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
+      com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
       return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result;
     }
     /**
-     *
-     *
      * 
      * The direction to order by. Defaults to `ASCENDING`.
      * 

      *
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
-     *
      * @param value The direction to set.
      * @return This builder for chaining.
      */
@@ -952,31 +864,28 @@ public Builder setDirection(com.google.datastore.v1.PropertyOrder.Direction valu
       if (value == null) {
         throw new NullPointerException();
       }
-
+      
       direction_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The direction to order by. Defaults to `ASCENDING`.
      * 

      *
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
-     *
      * @return This builder for chaining.
      */
     public Builder clearDirection() {
-
+      
       direction_ = 0;
       onChanged();
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -986,12 +895,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyOrder)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyOrder)
   private static final com.google.datastore.v1.PropertyOrder DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyOrder();
   }
@@ -1000,16 +909,16 @@ public static com.google.datastore.v1.PropertyOrder getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public PropertyOrder parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PropertyOrder(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public PropertyOrder parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new PropertyOrder(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1024,4 +933,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
index bb9417a94..e7c56c537 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrderOrBuilder.java
@@ -18,38 +18,29 @@
 
 package com.google.datastore.v1;
 
-public interface PropertyOrderOrBuilder
-    extends
+public interface PropertyOrderOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyOrder)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The property to order by.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return Whether the property field is set.
    */
   boolean hasProperty();
   /**
-   *
-   *
    * 
    * The property to order by.
    * 

    *
    * .google.datastore.v1.PropertyReference property = 1;
-   *
    * @return The property.
    */
   com.google.datastore.v1.PropertyReference getProperty();
   /**
-   *
-   *
    * 
    * The property to order by.
    * 

@@ -59,26 +50,20 @@ public interface PropertyOrderOrBuilder
   com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder();
 
   /**
-   *
-   *
    * 
    * The direction to order by. Defaults to `ASCENDING`.
    * 

    *
    * .google.datastore.v1.PropertyOrder.Direction direction = 2;
-   *
    * @return The enum numeric value on the wire for direction.
    */
   int getDirectionValue();
   /**
-   *
-   *
    * 
    * The direction to order by. Defaults to `ASCENDING`.
    * 

    *
    * .google.datastore.v1.PropertyOrder.Direction direction = 2;
-   *
    * @return The direction.
    */
   com.google.datastore.v1.PropertyOrder.Direction getDirection();
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java
index 33d3a347c..97bcd42e6 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java
@@ -19,39 +19,37 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A reference to a property relative to the kind expressions.
  * 

  *
  * Protobuf type {@code google.datastore.v1.PropertyReference}
  */
-public final class PropertyReference extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class PropertyReference extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.PropertyReference)
     PropertyReferenceOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use PropertyReference.newBuilder() to construct.
   private PropertyReference(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private PropertyReference() {
     name_ = "";
   }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new PropertyReference();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private PropertyReference(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -70,59 +68,53 @@ private PropertyReference(
           case 0:
             done = true;
             break;
-          case 18:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              name_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            name_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_PropertyReference_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.PropertyReference.class,
-            com.google.datastore.v1.PropertyReference.Builder.class);
+            com.google.datastore.v1.PropertyReference.class, com.google.datastore.v1.PropertyReference.Builder.class);
   }
 
   public static final int NAME_FIELD_NUMBER = 2;
   private volatile java.lang.Object name_;
   /**
-   *
-   *
    * 
    * The name of the property.
    * If name includes "."s, it may be interpreted as a property name path.
    * 

    *
    * string name = 2;
-   *
    * @return The name.
    */
   public java.lang.String getName() {
@@ -130,29 +122,29 @@ public java.lang.String getName() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       name_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * The name of the property.
    * If name includes "."s, it may be interpreted as a property name path.
    * 

    *
    * string name = 2;
-   *
    * @return The bytes for name.
    */
-  public com.google.protobuf.ByteString getNameBytes() {
+  public com.google.protobuf.ByteString
+      getNameBytes() {
     java.lang.Object ref = name_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       name_ = b;
       return b;
     } else {
@@ -161,7 +153,6 @@ public com.google.protobuf.ByteString getNameBytes() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -173,7 +164,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_);
     }
@@ -197,15 +189,15 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.PropertyReference)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.PropertyReference other =
-        (com.google.datastore.v1.PropertyReference) obj;
+    com.google.datastore.v1.PropertyReference other = (com.google.datastore.v1.PropertyReference) obj;
 
-    if (!getName().equals(other.getName())) return false;
+    if (!getName()
+        .equals(other.getName())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -224,127 +216,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.PropertyReference parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.PropertyReference parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PropertyReference parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyReference parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PropertyReference parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyReference parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.PropertyReference parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyReference parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PropertyReference parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.PropertyReference parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.PropertyReference parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PropertyReference parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.PropertyReference parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.PropertyReference parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.PropertyReference prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A reference to a property relative to the kind expressions.
    * 

    *
    * Protobuf type {@code google.datastore.v1.PropertyReference}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.PropertyReference)
       com.google.datastore.v1.PropertyReferenceOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_PropertyReference_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.PropertyReference.class,
-              com.google.datastore.v1.PropertyReference.Builder.class);
+              com.google.datastore.v1.PropertyReference.class, com.google.datastore.v1.PropertyReference.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.PropertyReference.newBuilder()
@@ -352,15 +335,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -370,9 +354,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_PropertyReference_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor;
     }
 
     @java.lang.Override
@@ -391,8 +375,7 @@ public com.google.datastore.v1.PropertyReference build() {
 
     @java.lang.Override
     public com.google.datastore.v1.PropertyReference buildPartial() {
-      com.google.datastore.v1.PropertyReference result =
-          new com.google.datastore.v1.PropertyReference(this);
+      com.google.datastore.v1.PropertyReference result = new com.google.datastore.v1.PropertyReference(this);
       result.name_ = name_;
       onBuilt();
       return result;
@@ -402,39 +385,38 @@ public com.google.datastore.v1.PropertyReference buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PropertyReference) {
-        return mergeFrom((com.google.datastore.v1.PropertyReference) other);
+        return mergeFrom((com.google.datastore.v1.PropertyReference)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -478,21 +460,19 @@ public Builder mergeFrom(
 
     private java.lang.Object name_ = "";
     /**
-     *
-     *
      * 
      * The name of the property.
      * If name includes "."s, it may be interpreted as a property name path.
      * 

      *
      * string name = 2;
-     *
      * @return The name.
      */
     public java.lang.String getName() {
       java.lang.Object ref = name_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         name_ = s;
         return s;
@@ -501,22 +481,21 @@ public java.lang.String getName() {
       }
     }
     /**
-     *
-     *
      * 
      * The name of the property.
      * If name includes "."s, it may be interpreted as a property name path.
      * 

      *
      * string name = 2;
-     *
      * @return The bytes for name.
      */
-    public com.google.protobuf.ByteString getNameBytes() {
+    public com.google.protobuf.ByteString
+        getNameBytes() {
       java.lang.Object ref = name_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         name_ = b;
         return b;
       } else {
@@ -524,71 +503,64 @@ public com.google.protobuf.ByteString getNameBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * The name of the property.
      * If name includes "."s, it may be interpreted as a property name path.
      * 

      *
      * string name = 2;
-     *
      * @param value The name to set.
      * @return This builder for chaining.
      */
-    public Builder setName(java.lang.String value) {
+    public Builder setName(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       name_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The name of the property.
      * If name includes "."s, it may be interpreted as a property name path.
      * 

      *
      * string name = 2;
-     *
      * @return This builder for chaining.
      */
     public Builder clearName() {
-
+      
       name_ = getDefaultInstance().getName();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The name of the property.
      * If name includes "."s, it may be interpreted as a property name path.
      * 

      *
      * string name = 2;
-     *
      * @param value The bytes for name to set.
      * @return This builder for chaining.
      */
-    public Builder setNameBytes(com.google.protobuf.ByteString value) {
+    public Builder setNameBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       name_ = value;
       onChanged();
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -598,12 +570,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.PropertyReference)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyReference)
   private static final com.google.datastore.v1.PropertyReference DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.PropertyReference();
   }
@@ -612,16 +584,16 @@ public static com.google.datastore.v1.PropertyReference getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public PropertyReference parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PropertyReference(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public PropertyReference parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new PropertyReference(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -636,4 +608,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
index 45f2069d7..8501b6f8a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReferenceOrBuilder.java
@@ -18,35 +18,29 @@
 
 package com.google.datastore.v1;
 
-public interface PropertyReferenceOrBuilder
-    extends
+public interface PropertyReferenceOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.PropertyReference)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The name of the property.
    * If name includes "."s, it may be interpreted as a property name path.
    * 

    *
    * string name = 2;
-   *
    * @return The name.
    */
   java.lang.String getName();
   /**
-   *
-   *
    * 
    * The name of the property.
    * If name includes "."s, it may be interpreted as a property name path.
    * 

    *
    * string name = 2;
-   *
    * @return The bytes for name.
    */
-  com.google.protobuf.ByteString getNameBytes();
+  com.google.protobuf.ByteString
+      getNameBytes();
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
index 56390c2ac..241c0612a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
@@ -19,24 +19,21 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A query for entities.
  * 

  *
  * Protobuf type {@code google.datastore.v1.Query}
  */
-public final class Query extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class Query extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Query)
     QueryOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use Query.newBuilder() to construct.
   private Query(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private Query() {
     projection_ = java.util.Collections.emptyList();
     kind_ = java.util.Collections.emptyList();
@@ -48,15 +45,16 @@ private Query() {
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new Query();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private Query(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -76,108 +74,97 @@ private Query(
           case 0:
             done = true;
             break;
-          case 18:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                projection_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              projection_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.Projection.parser(), extensionRegistry));
-              break;
+          case 18: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              projection_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
             }
-          case 26:
-            {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                kind_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              kind_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.KindExpression.parser(), extensionRegistry));
-              break;
-            }
-          case 34:
-            {
-              com.google.datastore.v1.Filter.Builder subBuilder = null;
-              if (filter_ != null) {
-                subBuilder = filter_.toBuilder();
-              }
-              filter_ =
-                  input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(filter_);
-                filter_ = subBuilder.buildPartial();
-              }
-
-              break;
+            projection_.add(
+                input.readMessage(com.google.datastore.v1.Projection.parser(), extensionRegistry));
+            break;
+          }
+          case 26: {
+            if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              kind_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000002;
             }
-          case 42:
-            {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                order_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              order_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyOrder.parser(), extensionRegistry));
-              break;
+            kind_.add(
+                input.readMessage(com.google.datastore.v1.KindExpression.parser(), extensionRegistry));
+            break;
+          }
+          case 34: {
+            com.google.datastore.v1.Filter.Builder subBuilder = null;
+            if (filter_ != null) {
+              subBuilder = filter_.toBuilder();
             }
-          case 50:
-            {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                distinctOn_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              distinctOn_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.PropertyReference.parser(), extensionRegistry));
-              break;
+            filter_ = input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(filter_);
+              filter_ = subBuilder.buildPartial();
             }
-          case 58:
-            {
-              startCursor_ = input.readBytes();
-              break;
+
+            break;
+          }
+          case 42: {
+            if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+              order_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000004;
             }
-          case 66:
-            {
-              endCursor_ = input.readBytes();
-              break;
+            order_.add(
+                input.readMessage(com.google.datastore.v1.PropertyOrder.parser(), extensionRegistry));
+            break;
+          }
+          case 50: {
+            if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+              distinctOn_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000008;
             }
-          case 80:
-            {
-              offset_ = input.readInt32();
-              break;
+            distinctOn_.add(
+                input.readMessage(com.google.datastore.v1.PropertyReference.parser(), extensionRegistry));
+            break;
+          }
+          case 58: {
+
+            startCursor_ = input.readBytes();
+            break;
+          }
+          case 66: {
+
+            endCursor_ = input.readBytes();
+            break;
+          }
+          case 80: {
+
+            offset_ = input.readInt32();
+            break;
+          }
+          case 98: {
+            com.google.protobuf.Int32Value.Builder subBuilder = null;
+            if (limit_ != null) {
+              subBuilder = limit_.toBuilder();
             }
-          case 98:
-            {
-              com.google.protobuf.Int32Value.Builder subBuilder = null;
-              if (limit_ != null) {
-                subBuilder = limit_.toBuilder();
-              }
-              limit_ =
-                  input.readMessage(com.google.protobuf.Int32Value.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(limit_);
-                limit_ = subBuilder.buildPartial();
-              }
-
-              break;
+            limit_ = input.readMessage(com.google.protobuf.Int32Value.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(limit_);
+              limit_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) != 0)) {
         projection_ = java.util.Collections.unmodifiableList(projection_);
@@ -195,16 +182,15 @@ private Query(
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_Query_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.Query.class, com.google.datastore.v1.Query.Builder.class);
   }
@@ -212,8 +198,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
   public static final int PROJECTION_FIELD_NUMBER = 2;
   private java.util.List projection_;
   /**
-   *
-   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

@@ -224,21 +208,17 @@ public java.util.List getProjectionList() {
     return projection_;
   }
   /**
-   *
-   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
-  public java.util.List
+  public java.util.List 
       getProjectionOrBuilderList() {
     return projection_;
   }
   /**
-   *
-   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

@@ -249,8 +229,6 @@ public int getProjectionCount() {
     return projection_.size();
   }
   /**
-   *
-   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

@@ -261,23 +239,20 @@ public com.google.datastore.v1.Projection getProjection(int index) {
     return projection_.get(index);
   }
   /**
-   *
-   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
-  public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int index) {
+  public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
+      int index) {
     return projection_.get(index);
   }
 
   public static final int KIND_FIELD_NUMBER = 3;
   private java.util.List kind_;
   /**
-   *
-   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -289,8 +264,6 @@ public java.util.List getKindList() {
     return kind_;
   }
   /**
-   *
-   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -298,13 +271,11 @@ public java.util.List getKindList() {
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
-  public java.util.List
+  public java.util.List 
       getKindOrBuilderList() {
     return kind_;
   }
   /**
-   *
-   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -316,8 +287,6 @@ public int getKindCount() {
     return kind_.size();
   }
   /**
-   *
-   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -329,8 +298,6 @@ public com.google.datastore.v1.KindExpression getKind(int index) {
     return kind_.get(index);
   }
   /**
-   *
-   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -338,43 +305,36 @@ public com.google.datastore.v1.KindExpression getKind(int index) {
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
-  public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int index) {
+  public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
+      int index) {
     return kind_.get(index);
   }
 
   public static final int FILTER_FIELD_NUMBER = 4;
   private com.google.datastore.v1.Filter filter_;
   /**
-   *
-   *
    * 
    * The filter to apply.
    * 

    *
    * .google.datastore.v1.Filter filter = 4;
-   *
    * @return Whether the filter field is set.
    */
   public boolean hasFilter() {
     return filter_ != null;
   }
   /**
-   *
-   *
    * 
    * The filter to apply.
    * 

    *
    * .google.datastore.v1.Filter filter = 4;
-   *
    * @return The filter.
    */
   public com.google.datastore.v1.Filter getFilter() {
     return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_;
   }
   /**
-   *
-   *
    * 
    * The filter to apply.
    * 

@@ -388,8 +348,6 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
   public static final int ORDER_FIELD_NUMBER = 5;
   private java.util.List order_;
   /**
-   *
-   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

@@ -400,21 +358,17 @@ public java.util.List getOrderList() {
     return order_;
   }
   /**
-   *
-   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
-  public java.util.List
+  public java.util.List 
       getOrderOrBuilderList() {
     return order_;
   }
   /**
-   *
-   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

@@ -425,8 +379,6 @@ public int getOrderCount() {
     return order_.size();
   }
   /**
-   *
-   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

@@ -437,23 +389,20 @@ public com.google.datastore.v1.PropertyOrder getOrder(int index) {
     return order_.get(index);
   }
   /**
-   *
-   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
-  public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int index) {
+  public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
+      int index) {
     return order_.get(index);
   }
 
   public static final int DISTINCT_ON_FIELD_NUMBER = 6;
   private java.util.List distinctOn_;
   /**
-   *
-   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -466,8 +415,6 @@ public java.util.List getDistinctOnLi
     return distinctOn_;
   }
   /**
-   *
-   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -476,13 +423,11 @@ public java.util.List getDistinctOnLi
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
-  public java.util.List
+  public java.util.List 
       getDistinctOnOrBuilderList() {
     return distinctOn_;
   }
   /**
-   *
-   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -495,8 +440,6 @@ public int getDistinctOnCount() {
     return distinctOn_.size();
   }
   /**
-   *
-   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -509,8 +452,6 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
     return distinctOn_.get(index);
   }
   /**
-   *
-   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -519,15 +460,14 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
-  public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(int index) {
+  public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(
+      int index) {
     return distinctOn_.get(index);
   }
 
   public static final int START_CURSOR_FIELD_NUMBER = 7;
   private com.google.protobuf.ByteString startCursor_;
   /**
-   *
-   *
    * 
    * A starting point for the query results. Query cursors are
    * returned in query result batches and
@@ -536,7 +476,6 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
    * 

    *
    * bytes start_cursor = 7;
-   *
    * @return The startCursor.
    */
   public com.google.protobuf.ByteString getStartCursor() {
@@ -546,8 +485,6 @@ public com.google.protobuf.ByteString getStartCursor() {
   public static final int END_CURSOR_FIELD_NUMBER = 8;
   private com.google.protobuf.ByteString endCursor_;
   /**
-   *
-   *
    * 
    * An ending point for the query results. Query cursors are
    * returned in query result batches and
@@ -556,7 +493,6 @@ public com.google.protobuf.ByteString getStartCursor() {
    * 

    *
    * bytes end_cursor = 8;
-   *
    * @return The endCursor.
    */
   public com.google.protobuf.ByteString getEndCursor() {
@@ -566,15 +502,12 @@ public com.google.protobuf.ByteString getEndCursor() {
   public static final int OFFSET_FIELD_NUMBER = 10;
   private int offset_;
   /**
-   *
-   *
    * 
    * The number of results to skip. Applies before limit, but after all other
    * constraints. Optional. Must be >= 0 if specified.
    * 

    *
    * int32 offset = 10;
-   *
    * @return The offset.
    */
   public int getOffset() {
@@ -584,8 +517,6 @@ public int getOffset() {
   public static final int LIMIT_FIELD_NUMBER = 12;
   private com.google.protobuf.Int32Value limit_;
   /**
-   *
-   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
@@ -594,15 +525,12 @@ public int getOffset() {
    * 

    *
    * .google.protobuf.Int32Value limit = 12;
-   *
    * @return Whether the limit field is set.
    */
   public boolean hasLimit() {
     return limit_ != null;
   }
   /**
-   *
-   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
@@ -611,15 +539,12 @@ public boolean hasLimit() {
    * 

    *
    * .google.protobuf.Int32Value limit = 12;
-   *
    * @return The limit.
    */
   public com.google.protobuf.Int32Value getLimit() {
     return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
   }
   /**
-   *
-   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
@@ -634,7 +559,6 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -646,7 +570,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     for (int i = 0; i < projection_.size(); i++) {
       output.writeMessage(2, projection_.get(i));
     }
@@ -684,31 +609,40 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < projection_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, projection_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, projection_.get(i));
     }
     for (int i = 0; i < kind_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, kind_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, kind_.get(i));
     }
     if (filter_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getFilter());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(4, getFilter());
     }
     for (int i = 0; i < order_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, order_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(5, order_.get(i));
     }
     for (int i = 0; i < distinctOn_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, distinctOn_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(6, distinctOn_.get(i));
     }
     if (!startCursor_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream.computeBytesSize(7, startCursor_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(7, startCursor_);
     }
     if (!endCursor_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream.computeBytesSize(8, endCursor_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(8, endCursor_);
     }
     if (offset_ != 0) {
-      size += com.google.protobuf.CodedOutputStream.computeInt32Size(10, offset_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(10, offset_);
     }
     if (limit_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getLimit());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(12, getLimit());
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -718,27 +652,36 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Query)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.Query other = (com.google.datastore.v1.Query) obj;
 
-    if (!getProjectionList().equals(other.getProjectionList())) return false;
-    if (!getKindList().equals(other.getKindList())) return false;
+    if (!getProjectionList()
+        .equals(other.getProjectionList())) return false;
+    if (!getKindList()
+        .equals(other.getKindList())) return false;
     if (hasFilter() != other.hasFilter()) return false;
     if (hasFilter()) {
-      if (!getFilter().equals(other.getFilter())) return false;
-    }
-    if (!getOrderList().equals(other.getOrderList())) return false;
-    if (!getDistinctOnList().equals(other.getDistinctOnList())) return false;
-    if (!getStartCursor().equals(other.getStartCursor())) return false;
-    if (!getEndCursor().equals(other.getEndCursor())) return false;
-    if (getOffset() != other.getOffset()) return false;
+      if (!getFilter()
+          .equals(other.getFilter())) return false;
+    }
+    if (!getOrderList()
+        .equals(other.getOrderList())) return false;
+    if (!getDistinctOnList()
+        .equals(other.getDistinctOnList())) return false;
+    if (!getStartCursor()
+        .equals(other.getStartCursor())) return false;
+    if (!getEndCursor()
+        .equals(other.getEndCursor())) return false;
+    if (getOffset()
+        != other.getOffset()) return false;
     if (hasLimit() != other.hasLimit()) return false;
     if (hasLimit()) {
-      if (!getLimit().equals(other.getLimit())) return false;
+      if (!getLimit()
+          .equals(other.getLimit())) return false;
     }
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
@@ -786,123 +729,116 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Query parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Query parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Query parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Query parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.Query parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Query parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Query parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Query parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Query parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Query parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Query parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Query parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Query parseFrom(com.google.protobuf.CodedInputStream input)
+  public static com.google.datastore.v1.Query parseFrom(
+      com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Query parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.Query prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A query for entities.
    * 

    *
    * Protobuf type {@code google.datastore.v1.Query}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Query)
       com.google.datastore.v1.QueryOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_Query_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_Query_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.google.datastore.v1.Query.class, com.google.datastore.v1.Query.Builder.class);
     }
@@ -912,20 +848,20 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getProjectionFieldBuilder();
         getKindFieldBuilder();
         getOrderFieldBuilder();
         getDistinctOnFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -975,9 +911,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_Query_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor;
     }
 
     @java.lang.Override
@@ -1055,39 +991,38 @@ public com.google.datastore.v1.Query buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Query) {
-        return mergeFrom((com.google.datastore.v1.Query) other);
+        return mergeFrom((com.google.datastore.v1.Query)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -1114,10 +1049,9 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             projectionBuilder_ = null;
             projection_ = other.projection_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            projectionBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getProjectionFieldBuilder()
-                    : null;
+            projectionBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getProjectionFieldBuilder() : null;
           } else {
             projectionBuilder_.addAllMessages(other.projection_);
           }
@@ -1141,10 +1075,9 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             kindBuilder_ = null;
             kind_ = other.kind_;
             bitField0_ = (bitField0_ & ~0x00000002);
-            kindBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getKindFieldBuilder()
-                    : null;
+            kindBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getKindFieldBuilder() : null;
           } else {
             kindBuilder_.addAllMessages(other.kind_);
           }
@@ -1171,10 +1104,9 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             orderBuilder_ = null;
             order_ = other.order_;
             bitField0_ = (bitField0_ & ~0x00000004);
-            orderBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getOrderFieldBuilder()
-                    : null;
+            orderBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getOrderFieldBuilder() : null;
           } else {
             orderBuilder_.addAllMessages(other.order_);
           }
@@ -1198,10 +1130,9 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
             distinctOnBuilder_ = null;
             distinctOn_ = other.distinctOn_;
             bitField0_ = (bitField0_ & ~0x00000008);
-            distinctOnBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getDistinctOnFieldBuilder()
-                    : null;
+            distinctOnBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getDistinctOnFieldBuilder() : null;
           } else {
             distinctOnBuilder_.addAllMessages(other.distinctOn_);
           }
@@ -1247,28 +1178,21 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
     private java.util.List projection_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureProjectionIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
         projection_ = new java.util.ArrayList(projection_);
         bitField0_ |= 0x00000001;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Projection,
-            com.google.datastore.v1.Projection.Builder,
-            com.google.datastore.v1.ProjectionOrBuilder>
-        projectionBuilder_;
+        com.google.datastore.v1.Projection, com.google.datastore.v1.Projection.Builder, com.google.datastore.v1.ProjectionOrBuilder> projectionBuilder_;
 
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1283,8 +1207,6 @@ public java.util.List getProjectionList() {
       }
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1299,8 +1221,6 @@ public int getProjectionCount() {
       }
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1315,15 +1235,14 @@ public com.google.datastore.v1.Projection getProjection(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public Builder setProjection(int index, com.google.datastore.v1.Projection value) {
+    public Builder setProjection(
+        int index, com.google.datastore.v1.Projection value) {
       if (projectionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1337,8 +1256,6 @@ public Builder setProjection(int index, com.google.datastore.v1.Projection value
       return this;
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1357,8 +1274,6 @@ public Builder setProjection(
       return this;
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1379,15 +1294,14 @@ public Builder addProjection(com.google.datastore.v1.Projection value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public Builder addProjection(int index, com.google.datastore.v1.Projection value) {
+    public Builder addProjection(
+        int index, com.google.datastore.v1.Projection value) {
       if (projectionBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1401,15 +1315,14 @@ public Builder addProjection(int index, com.google.datastore.v1.Projection value
       return this;
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public Builder addProjection(com.google.datastore.v1.Projection.Builder builderForValue) {
+    public Builder addProjection(
+        com.google.datastore.v1.Projection.Builder builderForValue) {
       if (projectionBuilder_ == null) {
         ensureProjectionIsMutable();
         projection_.add(builderForValue.build());
@@ -1420,8 +1333,6 @@ public Builder addProjection(com.google.datastore.v1.Projection.Builder builderF
       return this;
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1440,8 +1351,6 @@ public Builder addProjection(
       return this;
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1452,7 +1361,8 @@ public Builder addAllProjection(
         java.lang.Iterable values) {
       if (projectionBuilder_ == null) {
         ensureProjectionIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, projection_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, projection_);
         onChanged();
       } else {
         projectionBuilder_.addAllMessages(values);
@@ -1460,8 +1370,6 @@ public Builder addAllProjection(
       return this;
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1479,8 +1387,6 @@ public Builder clearProjection() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1498,44 +1404,39 @@ public Builder removeProjection(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public com.google.datastore.v1.Projection.Builder getProjectionBuilder(int index) {
+    public com.google.datastore.v1.Projection.Builder getProjectionBuilder(
+        int index) {
       return getProjectionFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int index) {
+    public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
+        int index) {
       if (projectionBuilder_ == null) {
-        return projection_.get(index);
-      } else {
+        return projection_.get(index);  } else {
         return projectionBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public java.util.List
-        getProjectionOrBuilderList() {
+    public java.util.List 
+         getProjectionOrBuilderList() {
       if (projectionBuilder_ != null) {
         return projectionBuilder_.getMessageOrBuilderList();
       } else {
@@ -1543,8 +1444,6 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in
       }
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

@@ -1552,71 +1451,60 @@ public com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int in
      * repeated .google.datastore.v1.Projection projection = 2;
      */
     public com.google.datastore.v1.Projection.Builder addProjectionBuilder() {
-      return getProjectionFieldBuilder()
-          .addBuilder(com.google.datastore.v1.Projection.getDefaultInstance());
+      return getProjectionFieldBuilder().addBuilder(
+          com.google.datastore.v1.Projection.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public com.google.datastore.v1.Projection.Builder addProjectionBuilder(int index) {
-      return getProjectionFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.Projection.getDefaultInstance());
+    public com.google.datastore.v1.Projection.Builder addProjectionBuilder(
+        int index) {
+      return getProjectionFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.Projection.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The projection to return. Defaults to returning all properties.
      * 

      *
      * repeated .google.datastore.v1.Projection projection = 2;
      */
-    public java.util.List getProjectionBuilderList() {
+    public java.util.List 
+         getProjectionBuilderList() {
       return getProjectionFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Projection,
-            com.google.datastore.v1.Projection.Builder,
-            com.google.datastore.v1.ProjectionOrBuilder>
+        com.google.datastore.v1.Projection, com.google.datastore.v1.Projection.Builder, com.google.datastore.v1.ProjectionOrBuilder> 
         getProjectionFieldBuilder() {
       if (projectionBuilder_ == null) {
-        projectionBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.Projection,
-                com.google.datastore.v1.Projection.Builder,
-                com.google.datastore.v1.ProjectionOrBuilder>(
-                projection_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        projectionBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.Projection, com.google.datastore.v1.Projection.Builder, com.google.datastore.v1.ProjectionOrBuilder>(
+                projection_,
+                ((bitField0_ & 0x00000001) != 0),
+                getParentForChildren(),
+                isClean());
         projection_ = null;
       }
       return projectionBuilder_;
     }
 
     private java.util.List kind_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureKindIsMutable() {
       if (!((bitField0_ & 0x00000002) != 0)) {
         kind_ = new java.util.ArrayList(kind_);
         bitField0_ |= 0x00000002;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.KindExpression,
-            com.google.datastore.v1.KindExpression.Builder,
-            com.google.datastore.v1.KindExpressionOrBuilder>
-        kindBuilder_;
+        com.google.datastore.v1.KindExpression, com.google.datastore.v1.KindExpression.Builder, com.google.datastore.v1.KindExpressionOrBuilder> kindBuilder_;
 
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1632,8 +1520,6 @@ public java.util.List getKindList() {
       }
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1649,8 +1535,6 @@ public int getKindCount() {
       }
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1666,8 +1550,6 @@ public com.google.datastore.v1.KindExpression getKind(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1675,7 +1557,8 @@ public com.google.datastore.v1.KindExpression getKind(int index) {
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public Builder setKind(int index, com.google.datastore.v1.KindExpression value) {
+    public Builder setKind(
+        int index, com.google.datastore.v1.KindExpression value) {
       if (kindBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1689,8 +1572,6 @@ public Builder setKind(int index, com.google.datastore.v1.KindExpression value)
       return this;
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1710,8 +1591,6 @@ public Builder setKind(
       return this;
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1733,8 +1612,6 @@ public Builder addKind(com.google.datastore.v1.KindExpression value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1742,7 +1619,8 @@ public Builder addKind(com.google.datastore.v1.KindExpression value) {
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public Builder addKind(int index, com.google.datastore.v1.KindExpression value) {
+    public Builder addKind(
+        int index, com.google.datastore.v1.KindExpression value) {
       if (kindBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1756,8 +1634,6 @@ public Builder addKind(int index, com.google.datastore.v1.KindExpression value)
       return this;
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1765,7 +1641,8 @@ public Builder addKind(int index, com.google.datastore.v1.KindExpression value)
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public Builder addKind(com.google.datastore.v1.KindExpression.Builder builderForValue) {
+    public Builder addKind(
+        com.google.datastore.v1.KindExpression.Builder builderForValue) {
       if (kindBuilder_ == null) {
         ensureKindIsMutable();
         kind_.add(builderForValue.build());
@@ -1776,8 +1653,6 @@ public Builder addKind(com.google.datastore.v1.KindExpression.Builder builderFor
       return this;
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1797,8 +1672,6 @@ public Builder addKind(
       return this;
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1810,7 +1683,8 @@ public Builder addAllKind(
         java.lang.Iterable values) {
       if (kindBuilder_ == null) {
         ensureKindIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, kind_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, kind_);
         onChanged();
       } else {
         kindBuilder_.addAllMessages(values);
@@ -1818,8 +1692,6 @@ public Builder addAllKind(
       return this;
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1838,8 +1710,6 @@ public Builder clearKind() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1858,8 +1728,6 @@ public Builder removeKind(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1867,12 +1735,11 @@ public Builder removeKind(int index) {
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public com.google.datastore.v1.KindExpression.Builder getKindBuilder(int index) {
+    public com.google.datastore.v1.KindExpression.Builder getKindBuilder(
+        int index) {
       return getKindFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1880,16 +1747,14 @@ public com.google.datastore.v1.KindExpression.Builder getKindBuilder(int index)
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int index) {
+    public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
+        int index) {
       if (kindBuilder_ == null) {
-        return kind_.get(index);
-      } else {
+        return kind_.get(index);  } else {
         return kindBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1897,8 +1762,8 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public java.util.List
-        getKindOrBuilderList() {
+    public java.util.List 
+         getKindOrBuilderList() {
       if (kindBuilder_ != null) {
         return kindBuilder_.getMessageOrBuilderList();
       } else {
@@ -1906,8 +1771,6 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde
       }
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1916,12 +1779,10 @@ public com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int inde
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
     public com.google.datastore.v1.KindExpression.Builder addKindBuilder() {
-      return getKindFieldBuilder()
-          .addBuilder(com.google.datastore.v1.KindExpression.getDefaultInstance());
+      return getKindFieldBuilder().addBuilder(
+          com.google.datastore.v1.KindExpression.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1929,13 +1790,12 @@ public com.google.datastore.v1.KindExpression.Builder addKindBuilder() {
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public com.google.datastore.v1.KindExpression.Builder addKindBuilder(int index) {
-      return getKindFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.KindExpression.getDefaultInstance());
+    public com.google.datastore.v1.KindExpression.Builder addKindBuilder(
+        int index) {
+      return getKindFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.KindExpression.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The kinds to query (if empty, returns entities of all kinds).
      * Currently at most 1 kind may be specified.
@@ -1943,22 +1803,20 @@ public com.google.datastore.v1.KindExpression.Builder addKindBuilder(int index)
      *
      * repeated .google.datastore.v1.KindExpression kind = 3;
      */
-    public java.util.List getKindBuilderList() {
+    public java.util.List 
+         getKindBuilderList() {
       return getKindFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.KindExpression,
-            com.google.datastore.v1.KindExpression.Builder,
-            com.google.datastore.v1.KindExpressionOrBuilder>
+        com.google.datastore.v1.KindExpression, com.google.datastore.v1.KindExpression.Builder, com.google.datastore.v1.KindExpressionOrBuilder> 
         getKindFieldBuilder() {
       if (kindBuilder_ == null) {
-        kindBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.KindExpression,
-                com.google.datastore.v1.KindExpression.Builder,
-                com.google.datastore.v1.KindExpressionOrBuilder>(
-                kind_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean());
+        kindBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.KindExpression, com.google.datastore.v1.KindExpression.Builder, com.google.datastore.v1.KindExpressionOrBuilder>(
+                kind_,
+                ((bitField0_ & 0x00000002) != 0),
+                getParentForChildren(),
+                isClean());
         kind_ = null;
       }
       return kindBuilder_;
@@ -1966,33 +1824,24 @@ public java.util.List getKindBui
 
     private com.google.datastore.v1.Filter filter_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Filter,
-            com.google.datastore.v1.Filter.Builder,
-            com.google.datastore.v1.FilterOrBuilder>
-        filterBuilder_;
+        com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> filterBuilder_;
     /**
-     *
-     *
      * 
      * The filter to apply.
      * 

      *
      * .google.datastore.v1.Filter filter = 4;
-     *
      * @return Whether the filter field is set.
      */
     public boolean hasFilter() {
       return filterBuilder_ != null || filter_ != null;
     }
     /**
-     *
-     *
      * 
      * The filter to apply.
      * 

      *
      * .google.datastore.v1.Filter filter = 4;
-     *
      * @return The filter.
      */
     public com.google.datastore.v1.Filter getFilter() {
@@ -2003,8 +1852,6 @@ public com.google.datastore.v1.Filter getFilter() {
       }
     }
     /**
-     *
-     *
      * 
      * The filter to apply.
      * 

@@ -2025,15 +1872,14 @@ public Builder setFilter(com.google.datastore.v1.Filter value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The filter to apply.
      * 

      *
      * .google.datastore.v1.Filter filter = 4;
      */
-    public Builder setFilter(com.google.datastore.v1.Filter.Builder builderForValue) {
+    public Builder setFilter(
+        com.google.datastore.v1.Filter.Builder builderForValue) {
       if (filterBuilder_ == null) {
         filter_ = builderForValue.build();
         onChanged();
@@ -2044,8 +1890,6 @@ public Builder setFilter(com.google.datastore.v1.Filter.Builder builderForValue)
       return this;
     }
     /**
-     *
-     *
      * 
      * The filter to apply.
      * 

@@ -2056,7 +1900,7 @@ public Builder mergeFilter(com.google.datastore.v1.Filter value) {
       if (filterBuilder_ == null) {
         if (filter_ != null) {
           filter_ =
-              com.google.datastore.v1.Filter.newBuilder(filter_).mergeFrom(value).buildPartial();
+            com.google.datastore.v1.Filter.newBuilder(filter_).mergeFrom(value).buildPartial();
         } else {
           filter_ = value;
         }
@@ -2068,8 +1912,6 @@ public Builder mergeFilter(com.google.datastore.v1.Filter value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The filter to apply.
      * 

@@ -2088,8 +1930,6 @@ public Builder clearFilter() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The filter to apply.
      * 

@@ -2097,13 +1937,11 @@ public Builder clearFilter() {
      * .google.datastore.v1.Filter filter = 4;
      */
     public com.google.datastore.v1.Filter.Builder getFilterBuilder() {
-
+      
       onChanged();
       return getFilterFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The filter to apply.
      * 

@@ -2114,12 +1952,11 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
       if (filterBuilder_ != null) {
         return filterBuilder_.getMessageOrBuilder();
       } else {
-        return filter_ == null ? com.google.datastore.v1.Filter.getDefaultInstance() : filter_;
+        return filter_ == null ?
+            com.google.datastore.v1.Filter.getDefaultInstance() : filter_;
       }
     }
     /**
-     *
-     *
      * 
      * The filter to apply.
      * 

@@ -2127,41 +1964,32 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() {
      * .google.datastore.v1.Filter filter = 4;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Filter,
-            com.google.datastore.v1.Filter.Builder,
-            com.google.datastore.v1.FilterOrBuilder>
+        com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder> 
         getFilterFieldBuilder() {
       if (filterBuilder_ == null) {
-        filterBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Filter,
-                com.google.datastore.v1.Filter.Builder,
-                com.google.datastore.v1.FilterOrBuilder>(
-                getFilter(), getParentForChildren(), isClean());
+        filterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder>(
+                getFilter(),
+                getParentForChildren(),
+                isClean());
         filter_ = null;
       }
       return filterBuilder_;
     }
 
     private java.util.List order_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureOrderIsMutable() {
       if (!((bitField0_ & 0x00000004) != 0)) {
         order_ = new java.util.ArrayList(order_);
         bitField0_ |= 0x00000004;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.PropertyOrder,
-            com.google.datastore.v1.PropertyOrder.Builder,
-            com.google.datastore.v1.PropertyOrderOrBuilder>
-        orderBuilder_;
+        com.google.datastore.v1.PropertyOrder, com.google.datastore.v1.PropertyOrder.Builder, com.google.datastore.v1.PropertyOrderOrBuilder> orderBuilder_;
 
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2176,8 +2004,6 @@ public java.util.List getOrderList() {
       }
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2192,8 +2018,6 @@ public int getOrderCount() {
       }
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2208,15 +2032,14 @@ public com.google.datastore.v1.PropertyOrder getOrder(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public Builder setOrder(int index, com.google.datastore.v1.PropertyOrder value) {
+    public Builder setOrder(
+        int index, com.google.datastore.v1.PropertyOrder value) {
       if (orderBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2230,8 +2053,6 @@ public Builder setOrder(int index, com.google.datastore.v1.PropertyOrder value)
       return this;
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2250,8 +2071,6 @@ public Builder setOrder(
       return this;
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2272,15 +2091,14 @@ public Builder addOrder(com.google.datastore.v1.PropertyOrder value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public Builder addOrder(int index, com.google.datastore.v1.PropertyOrder value) {
+    public Builder addOrder(
+        int index, com.google.datastore.v1.PropertyOrder value) {
       if (orderBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2294,15 +2112,14 @@ public Builder addOrder(int index, com.google.datastore.v1.PropertyOrder value)
       return this;
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public Builder addOrder(com.google.datastore.v1.PropertyOrder.Builder builderForValue) {
+    public Builder addOrder(
+        com.google.datastore.v1.PropertyOrder.Builder builderForValue) {
       if (orderBuilder_ == null) {
         ensureOrderIsMutable();
         order_.add(builderForValue.build());
@@ -2313,8 +2130,6 @@ public Builder addOrder(com.google.datastore.v1.PropertyOrder.Builder builderFor
       return this;
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2333,8 +2148,6 @@ public Builder addOrder(
       return this;
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2345,7 +2158,8 @@ public Builder addAllOrder(
         java.lang.Iterable values) {
       if (orderBuilder_ == null) {
         ensureOrderIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, order_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, order_);
         onChanged();
       } else {
         orderBuilder_.addAllMessages(values);
@@ -2353,8 +2167,6 @@ public Builder addAllOrder(
       return this;
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2372,8 +2184,6 @@ public Builder clearOrder() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2391,44 +2201,39 @@ public Builder removeOrder(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public com.google.datastore.v1.PropertyOrder.Builder getOrderBuilder(int index) {
+    public com.google.datastore.v1.PropertyOrder.Builder getOrderBuilder(
+        int index) {
       return getOrderFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int index) {
+    public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
+        int index) {
       if (orderBuilder_ == null) {
-        return order_.get(index);
-      } else {
+        return order_.get(index);  } else {
         return orderBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public java.util.List
-        getOrderOrBuilderList() {
+    public java.util.List 
+         getOrderOrBuilderList() {
       if (orderBuilder_ != null) {
         return orderBuilder_.getMessageOrBuilderList();
       } else {
@@ -2436,8 +2241,6 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde
       }
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

@@ -2445,72 +2248,60 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
     public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder() {
-      return getOrderFieldBuilder()
-          .addBuilder(com.google.datastore.v1.PropertyOrder.getDefaultInstance());
+      return getOrderFieldBuilder().addBuilder(
+          com.google.datastore.v1.PropertyOrder.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder(int index) {
-      return getOrderFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.PropertyOrder.getDefaultInstance());
+    public com.google.datastore.v1.PropertyOrder.Builder addOrderBuilder(
+        int index) {
+      return getOrderFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.PropertyOrder.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The order to apply to the query results (if empty, order is unspecified).
      * 

      *
      * repeated .google.datastore.v1.PropertyOrder order = 5;
      */
-    public java.util.List getOrderBuilderList() {
+    public java.util.List 
+         getOrderBuilderList() {
       return getOrderFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.PropertyOrder,
-            com.google.datastore.v1.PropertyOrder.Builder,
-            com.google.datastore.v1.PropertyOrderOrBuilder>
+        com.google.datastore.v1.PropertyOrder, com.google.datastore.v1.PropertyOrder.Builder, com.google.datastore.v1.PropertyOrderOrBuilder> 
         getOrderFieldBuilder() {
       if (orderBuilder_ == null) {
-        orderBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.PropertyOrder,
-                com.google.datastore.v1.PropertyOrder.Builder,
-                com.google.datastore.v1.PropertyOrderOrBuilder>(
-                order_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean());
+        orderBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.PropertyOrder, com.google.datastore.v1.PropertyOrder.Builder, com.google.datastore.v1.PropertyOrderOrBuilder>(
+                order_,
+                ((bitField0_ & 0x00000004) != 0),
+                getParentForChildren(),
+                isClean());
         order_ = null;
       }
       return orderBuilder_;
     }
 
     private java.util.List distinctOn_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureDistinctOnIsMutable() {
       if (!((bitField0_ & 0x00000008) != 0)) {
-        distinctOn_ =
-            new java.util.ArrayList(distinctOn_);
+        distinctOn_ = new java.util.ArrayList(distinctOn_);
         bitField0_ |= 0x00000008;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference,
-            com.google.datastore.v1.PropertyReference.Builder,
-            com.google.datastore.v1.PropertyReferenceOrBuilder>
-        distinctOnBuilder_;
+        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> distinctOnBuilder_;
 
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2527,8 +2318,6 @@ public java.util.List getDistinctOnLi
       }
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2545,8 +2334,6 @@ public int getDistinctOnCount() {
       }
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2563,8 +2350,6 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2573,7 +2358,8 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public Builder setDistinctOn(int index, com.google.datastore.v1.PropertyReference value) {
+    public Builder setDistinctOn(
+        int index, com.google.datastore.v1.PropertyReference value) {
       if (distinctOnBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2587,8 +2373,6 @@ public Builder setDistinctOn(int index, com.google.datastore.v1.PropertyReferenc
       return this;
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2609,8 +2393,6 @@ public Builder setDistinctOn(
       return this;
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2633,8 +2415,6 @@ public Builder addDistinctOn(com.google.datastore.v1.PropertyReference value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2643,7 +2423,8 @@ public Builder addDistinctOn(com.google.datastore.v1.PropertyReference value) {
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public Builder addDistinctOn(int index, com.google.datastore.v1.PropertyReference value) {
+    public Builder addDistinctOn(
+        int index, com.google.datastore.v1.PropertyReference value) {
       if (distinctOnBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -2657,8 +2438,6 @@ public Builder addDistinctOn(int index, com.google.datastore.v1.PropertyReferenc
       return this;
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2679,8 +2458,6 @@ public Builder addDistinctOn(
       return this;
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2701,8 +2478,6 @@ public Builder addDistinctOn(
       return this;
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2715,7 +2490,8 @@ public Builder addAllDistinctOn(
         java.lang.Iterable values) {
       if (distinctOnBuilder_ == null) {
         ensureDistinctOnIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, distinctOn_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, distinctOn_);
         onChanged();
       } else {
         distinctOnBuilder_.addAllMessages(values);
@@ -2723,8 +2499,6 @@ public Builder addAllDistinctOn(
       return this;
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2744,8 +2518,6 @@ public Builder clearDistinctOn() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2765,8 +2537,6 @@ public Builder removeDistinctOn(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2775,12 +2545,11 @@ public Builder removeDistinctOn(int index) {
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public com.google.datastore.v1.PropertyReference.Builder getDistinctOnBuilder(int index) {
+    public com.google.datastore.v1.PropertyReference.Builder getDistinctOnBuilder(
+        int index) {
       return getDistinctOnFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2789,16 +2558,14 @@ public com.google.datastore.v1.PropertyReference.Builder getDistinctOnBuilder(in
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(int index) {
+    public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(
+        int index) {
       if (distinctOnBuilder_ == null) {
-        return distinctOn_.get(index);
-      } else {
+        return distinctOn_.get(index);  } else {
         return distinctOnBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2807,8 +2574,8 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public java.util.List
-        getDistinctOnOrBuilderList() {
+    public java.util.List 
+         getDistinctOnOrBuilderList() {
       if (distinctOnBuilder_ != null) {
         return distinctOnBuilder_.getMessageOrBuilderList();
       } else {
@@ -2816,8 +2583,6 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
       }
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2827,12 +2592,10 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
     public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder() {
-      return getDistinctOnFieldBuilder()
-          .addBuilder(com.google.datastore.v1.PropertyReference.getDefaultInstance());
+      return getDistinctOnFieldBuilder().addBuilder(
+          com.google.datastore.v1.PropertyReference.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2841,13 +2604,12 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder()
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(int index) {
-      return getDistinctOnFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.PropertyReference.getDefaultInstance());
+    public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(
+        int index) {
+      return getDistinctOnFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.PropertyReference.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The properties to make distinct. The query results will contain the first
      * result for each distinct combination of values for the given properties
@@ -2856,23 +2618,20 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
      *
      * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
      */
-    public java.util.List
-        getDistinctOnBuilderList() {
+    public java.util.List 
+         getDistinctOnBuilderList() {
       return getDistinctOnFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.PropertyReference,
-            com.google.datastore.v1.PropertyReference.Builder,
-            com.google.datastore.v1.PropertyReferenceOrBuilder>
+        com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder> 
         getDistinctOnFieldBuilder() {
       if (distinctOnBuilder_ == null) {
-        distinctOnBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.PropertyReference,
-                com.google.datastore.v1.PropertyReference.Builder,
-                com.google.datastore.v1.PropertyReferenceOrBuilder>(
-                distinctOn_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean());
+        distinctOnBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>(
+                distinctOn_,
+                ((bitField0_ & 0x00000008) != 0),
+                getParentForChildren(),
+                isClean());
         distinctOn_ = null;
       }
       return distinctOnBuilder_;
@@ -2880,8 +2639,6 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
 
     private com.google.protobuf.ByteString startCursor_ = com.google.protobuf.ByteString.EMPTY;
     /**
-     *
-     *
      * 
      * A starting point for the query results. Query cursors are
      * returned in query result batches and
@@ -2890,15 +2647,12 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
      * 

      *
      * bytes start_cursor = 7;
-     *
      * @return The startCursor.
      */
     public com.google.protobuf.ByteString getStartCursor() {
       return startCursor_;
     }
     /**
-     *
-     *
      * 
      * A starting point for the query results. Query cursors are
      * returned in query result batches and
@@ -2907,22 +2661,19 @@ public com.google.protobuf.ByteString getStartCursor() {
      * 

      *
      * bytes start_cursor = 7;
-     *
      * @param value The startCursor to set.
      * @return This builder for chaining.
      */
     public Builder setStartCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       startCursor_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * A starting point for the query results. Query cursors are
      * returned in query result batches and
@@ -2931,11 +2682,10 @@ public Builder setStartCursor(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes start_cursor = 7;
-     *
      * @return This builder for chaining.
      */
     public Builder clearStartCursor() {
-
+      
       startCursor_ = getDefaultInstance().getStartCursor();
       onChanged();
       return this;
@@ -2943,8 +2693,6 @@ public Builder clearStartCursor() {
 
     private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY;
     /**
-     *
-     *
      * 
      * An ending point for the query results. Query cursors are
      * returned in query result batches and
@@ -2953,15 +2701,12 @@ public Builder clearStartCursor() {
      * 

      *
      * bytes end_cursor = 8;
-     *
      * @return The endCursor.
      */
     public com.google.protobuf.ByteString getEndCursor() {
       return endCursor_;
     }
     /**
-     *
-     *
      * 
      * An ending point for the query results. Query cursors are
      * returned in query result batches and
@@ -2970,22 +2715,19 @@ public com.google.protobuf.ByteString getEndCursor() {
      * 

      *
      * bytes end_cursor = 8;
-     *
      * @param value The endCursor to set.
      * @return This builder for chaining.
      */
     public Builder setEndCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       endCursor_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * An ending point for the query results. Query cursors are
      * returned in query result batches and
@@ -2994,65 +2736,55 @@ public Builder setEndCursor(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes end_cursor = 8;
-     *
      * @return This builder for chaining.
      */
     public Builder clearEndCursor() {
-
+      
       endCursor_ = getDefaultInstance().getEndCursor();
       onChanged();
       return this;
     }
 
-    private int offset_;
+    private int offset_ ;
     /**
-     *
-     *
      * 
      * The number of results to skip. Applies before limit, but after all other
      * constraints. Optional. Must be >= 0 if specified.
      * 

      *
      * int32 offset = 10;
-     *
      * @return The offset.
      */
     public int getOffset() {
       return offset_;
     }
     /**
-     *
-     *
      * 
      * The number of results to skip. Applies before limit, but after all other
      * constraints. Optional. Must be >= 0 if specified.
      * 

      *
      * int32 offset = 10;
-     *
      * @param value The offset to set.
      * @return This builder for chaining.
      */
     public Builder setOffset(int value) {
-
+      
       offset_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The number of results to skip. Applies before limit, but after all other
      * constraints. Optional. Must be >= 0 if specified.
      * 

      *
      * int32 offset = 10;
-     *
      * @return This builder for chaining.
      */
     public Builder clearOffset() {
-
+      
       offset_ = 0;
       onChanged();
       return this;
@@ -3060,13 +2792,8 @@ public Builder clearOffset() {
 
     private com.google.protobuf.Int32Value limit_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Int32Value,
-            com.google.protobuf.Int32Value.Builder,
-            com.google.protobuf.Int32ValueOrBuilder>
-        limitBuilder_;
+        com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, com.google.protobuf.Int32ValueOrBuilder> limitBuilder_;
     /**
-     *
-     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -3075,15 +2802,12 @@ public Builder clearOffset() {
      * 

      *
      * .google.protobuf.Int32Value limit = 12;
-     *
      * @return Whether the limit field is set.
      */
     public boolean hasLimit() {
       return limitBuilder_ != null || limit_ != null;
     }
     /**
-     *
-     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -3092,7 +2816,6 @@ public boolean hasLimit() {
      * 

      *
      * .google.protobuf.Int32Value limit = 12;
-     *
      * @return The limit.
      */
     public com.google.protobuf.Int32Value getLimit() {
@@ -3103,8 +2826,6 @@ public com.google.protobuf.Int32Value getLimit() {
       }
     }
     /**
-     *
-     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -3128,8 +2849,6 @@ public Builder setLimit(com.google.protobuf.Int32Value value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -3139,7 +2858,8 @@ public Builder setLimit(com.google.protobuf.Int32Value value) {
      *
      * .google.protobuf.Int32Value limit = 12;
      */
-    public Builder setLimit(com.google.protobuf.Int32Value.Builder builderForValue) {
+    public Builder setLimit(
+        com.google.protobuf.Int32Value.Builder builderForValue) {
       if (limitBuilder_ == null) {
         limit_ = builderForValue.build();
         onChanged();
@@ -3150,8 +2870,6 @@ public Builder setLimit(com.google.protobuf.Int32Value.Builder builderForValue)
       return this;
     }
     /**
-     *
-     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -3165,7 +2883,7 @@ public Builder mergeLimit(com.google.protobuf.Int32Value value) {
       if (limitBuilder_ == null) {
         if (limit_ != null) {
           limit_ =
-              com.google.protobuf.Int32Value.newBuilder(limit_).mergeFrom(value).buildPartial();
+            com.google.protobuf.Int32Value.newBuilder(limit_).mergeFrom(value).buildPartial();
         } else {
           limit_ = value;
         }
@@ -3177,8 +2895,6 @@ public Builder mergeLimit(com.google.protobuf.Int32Value value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -3200,8 +2916,6 @@ public Builder clearLimit() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -3212,13 +2926,11 @@ public Builder clearLimit() {
      * .google.protobuf.Int32Value limit = 12;
      */
     public com.google.protobuf.Int32Value.Builder getLimitBuilder() {
-
+      
       onChanged();
       return getLimitFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -3232,12 +2944,11 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
       if (limitBuilder_ != null) {
         return limitBuilder_.getMessageOrBuilder();
       } else {
-        return limit_ == null ? com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
+        return limit_ == null ?
+            com.google.protobuf.Int32Value.getDefaultInstance() : limit_;
       }
     }
     /**
-     *
-     *
      * 
      * The maximum number of results to return. Applies after all other
      * constraints. Optional.
@@ -3248,24 +2959,21 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
      * .google.protobuf.Int32Value limit = 12;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Int32Value,
-            com.google.protobuf.Int32Value.Builder,
-            com.google.protobuf.Int32ValueOrBuilder>
+        com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, com.google.protobuf.Int32ValueOrBuilder> 
         getLimitFieldBuilder() {
       if (limitBuilder_ == null) {
-        limitBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.protobuf.Int32Value,
-                com.google.protobuf.Int32Value.Builder,
-                com.google.protobuf.Int32ValueOrBuilder>(
-                getLimit(), getParentForChildren(), isClean());
+        limitBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, com.google.protobuf.Int32ValueOrBuilder>(
+                getLimit(),
+                getParentForChildren(),
+                isClean());
         limit_ = null;
       }
       return limitBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -3275,12 +2983,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Query)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Query)
   private static final com.google.datastore.v1.Query DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Query();
   }
@@ -3289,16 +2997,16 @@ public static com.google.datastore.v1.Query getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public Query parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Query(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public Query parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Query(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -3313,4 +3021,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Query getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java
index 56d8980c3..4a34e12a1 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java
@@ -18,24 +18,20 @@
 
 package com.google.datastore.v1;
 
-public interface QueryOrBuilder
-    extends
+public interface QueryOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Query)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
-  java.util.List getProjectionList();
+  java.util.List 
+      getProjectionList();
   /**
-   *
-   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

@@ -44,8 +40,6 @@ public interface QueryOrBuilder
    */
   com.google.datastore.v1.Projection getProjection(int index);
   /**
-   *
-   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

@@ -54,30 +48,25 @@ public interface QueryOrBuilder
    */
   int getProjectionCount();
   /**
-   *
-   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
-  java.util.List
+  java.util.List 
       getProjectionOrBuilderList();
   /**
-   *
-   *
    * 
    * The projection to return. Defaults to returning all properties.
    * 

    *
    * repeated .google.datastore.v1.Projection projection = 2;
    */
-  com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(int index);
+  com.google.datastore.v1.ProjectionOrBuilder getProjectionOrBuilder(
+      int index);
 
   /**
-   *
-   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -85,10 +74,9 @@ public interface QueryOrBuilder
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
-  java.util.List getKindList();
+  java.util.List 
+      getKindList();
   /**
-   *
-   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -98,8 +86,6 @@ public interface QueryOrBuilder
    */
   com.google.datastore.v1.KindExpression getKind(int index);
   /**
-   *
-   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -109,8 +95,6 @@ public interface QueryOrBuilder
    */
   int getKindCount();
   /**
-   *
-   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -118,10 +102,9 @@ public interface QueryOrBuilder
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
-  java.util.List getKindOrBuilderList();
+  java.util.List 
+      getKindOrBuilderList();
   /**
-   *
-   *
    * 
    * The kinds to query (if empty, returns entities of all kinds).
    * Currently at most 1 kind may be specified.
@@ -129,35 +112,28 @@ public interface QueryOrBuilder
    *
    * repeated .google.datastore.v1.KindExpression kind = 3;
    */
-  com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(int index);
+  com.google.datastore.v1.KindExpressionOrBuilder getKindOrBuilder(
+      int index);
 
   /**
-   *
-   *
    * 
    * The filter to apply.
    * 

    *
    * .google.datastore.v1.Filter filter = 4;
-   *
    * @return Whether the filter field is set.
    */
   boolean hasFilter();
   /**
-   *
-   *
    * 
    * The filter to apply.
    * 

    *
    * .google.datastore.v1.Filter filter = 4;
-   *
    * @return The filter.
    */
   com.google.datastore.v1.Filter getFilter();
   /**
-   *
-   *
    * 
    * The filter to apply.
    * 

@@ -167,18 +143,15 @@ public interface QueryOrBuilder
   com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder();
 
   /**
-   *
-   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
-  java.util.List getOrderList();
+  java.util.List 
+      getOrderList();
   /**
-   *
-   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

@@ -187,8 +160,6 @@ public interface QueryOrBuilder
    */
   com.google.datastore.v1.PropertyOrder getOrder(int index);
   /**
-   *
-   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

@@ -197,29 +168,25 @@ public interface QueryOrBuilder
    */
   int getOrderCount();
   /**
-   *
-   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
-  java.util.List getOrderOrBuilderList();
+  java.util.List 
+      getOrderOrBuilderList();
   /**
-   *
-   *
    * 
    * The order to apply to the query results (if empty, order is unspecified).
    * 

    *
    * repeated .google.datastore.v1.PropertyOrder order = 5;
    */
-  com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int index);
+  com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(
+      int index);
 
   /**
-   *
-   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -228,10 +195,9 @@ public interface QueryOrBuilder
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
-  java.util.List getDistinctOnList();
+  java.util.List 
+      getDistinctOnList();
   /**
-   *
-   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -242,8 +208,6 @@ public interface QueryOrBuilder
    */
   com.google.datastore.v1.PropertyReference getDistinctOn(int index);
   /**
-   *
-   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -254,8 +218,6 @@ public interface QueryOrBuilder
    */
   int getDistinctOnCount();
   /**
-   *
-   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -264,11 +226,9 @@ public interface QueryOrBuilder
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
-  java.util.List
+  java.util.List 
       getDistinctOnOrBuilderList();
   /**
-   *
-   *
    * 
    * The properties to make distinct. The query results will contain the first
    * result for each distinct combination of values for the given properties
@@ -277,11 +237,10 @@ public interface QueryOrBuilder
    *
    * repeated .google.datastore.v1.PropertyReference distinct_on = 6;
    */
-  com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(int index);
+  com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder(
+      int index);
 
   /**
-   *
-   *
    * 
    * A starting point for the query results. Query cursors are
    * returned in query result batches and
@@ -290,14 +249,11 @@ public interface QueryOrBuilder
    * 

    *
    * bytes start_cursor = 7;
-   *
    * @return The startCursor.
    */
   com.google.protobuf.ByteString getStartCursor();
 
   /**
-   *
-   *
    * 
    * An ending point for the query results. Query cursors are
    * returned in query result batches and
@@ -306,28 +262,22 @@ public interface QueryOrBuilder
    * 

    *
    * bytes end_cursor = 8;
-   *
    * @return The endCursor.
    */
   com.google.protobuf.ByteString getEndCursor();
 
   /**
-   *
-   *
    * 
    * The number of results to skip. Applies before limit, but after all other
    * constraints. Optional. Must be >= 0 if specified.
    * 

    *
    * int32 offset = 10;
-   *
    * @return The offset.
    */
   int getOffset();
 
   /**
-   *
-   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
@@ -336,13 +286,10 @@ public interface QueryOrBuilder
    * 

    *
    * .google.protobuf.Int32Value limit = 12;
-   *
    * @return Whether the limit field is set.
    */
   boolean hasLimit();
   /**
-   *
-   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
@@ -351,13 +298,10 @@ public interface QueryOrBuilder
    * 

    *
    * .google.protobuf.Int32Value limit = 12;
-   *
    * @return The limit.
    */
   com.google.protobuf.Int32Value getLimit();
   /**
-   *
-   *
    * 
    * The maximum number of results to return. Applies after all other
    * constraints. Optional.
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
index 114735acb..6bd4d028c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
@@ -20,271 +20,246 @@
 
 public final class QueryProto {
   private QueryProto() {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
-    registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
   }
 
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_EntityResult_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_EntityResult_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_EntityResult_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_Query_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_Query_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Query_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_KindExpression_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_KindExpression_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_KindExpression_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_PropertyReference_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_PropertyReference_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_Projection_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_Projection_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Projection_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_PropertyOrder_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_PropertyOrder_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_Filter_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_Filter_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_Filter_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_CompositeFilter_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_CompositeFilter_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_PropertyFilter_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_PropertyFilter_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_GqlQuery_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_GqlQuery_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_GqlQuery_NamedBindingsEntry_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_datastore_v1_QueryResultBatch_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    internal_static_google_datastore_v1_QueryResultBatch_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable;
 
-  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
     return descriptor;
   }
-
-  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\037google/datastore/v1/query.proto\022\023googl"
-          + "e.datastore.v1\032\034google/api/annotations.p"
-          + "roto\032 google/datastore/v1/entity.proto\032\036"
-          + "google/protobuf/wrappers.proto\032\030google/t"
-          + "ype/latlng.proto\"\257\001\n\014EntityResult\022+\n\006ent"
-          + "ity\030\001 \001(\0132\033.google.datastore.v1.Entity\022\017"
-          + "\n\007version\030\004 \001(\003\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResul"
-          + "tType\022\033\n\027RESULT_TYPE_UNSPECIFIED\020\000\022\010\n\004FU"
-          + "LL\020\001\022\016\n\nPROJECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Q"
-          + "uery\0223\n\nprojection\030\002 \003(\0132\037.google.datast"
-          + "ore.v1.Projection\0221\n\004kind\030\003 \003(\0132#.google"
-          + ".datastore.v1.KindExpression\022+\n\006filter\030\004"
-          + " \001(\0132\033.google.datastore.v1.Filter\0221\n\005ord"
-          + "er\030\005 \003(\0132\".google.datastore.v1.PropertyO"
-          + "rder\022;\n\013distinct_on\030\006 \003(\0132&.google.datas"
-          + "tore.v1.PropertyReference\022\024\n\014start_curso"
-          + "r\030\007 \001(\014\022\022\n\nend_cursor\030\010 \001(\014\022\016\n\006offset\030\n "
-          + "\001(\005\022*\n\005limit\030\014 \001(\0132\033.google.protobuf.Int"
-          + "32Value\"\036\n\016KindExpression\022\014\n\004name\030\001 \001(\t\""
-          + "!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n\nPr"
-          + "ojection\0228\n\010property\030\001 \001(\0132&.google.data"
-          + "store.v1.PropertyReference\"\321\001\n\rPropertyO"
-          + "rder\0228\n\010property\030\001 \001(\0132&.google.datastor"
-          + "e.v1.PropertyReference\022?\n\tdirection\030\002 \001("
-          + "\0162,.google.datastore.v1.PropertyOrder.Di"
-          + "rection\"E\n\tDirection\022\031\n\025DIRECTION_UNSPEC"
-          + "IFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020\002\"\231"
-          + "\001\n\006Filter\022@\n\020composite_filter\030\001 \001(\0132$.go"
-          + "ogle.datastore.v1.CompositeFilterH\000\022>\n\017p"
-          + "roperty_filter\030\002 \001(\0132#.google.datastore."
-          + "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C"
-          + "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data"
-          + "store.v1.CompositeFilter.Operator\022,\n\007fil"
-          + "ters\030\002 \003(\0132\033.google.datastore.v1.Filter\""
-          + "-\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED\020\000\022\007\n"
-          + "\003AND\020\001\"\307\002\n\016PropertyFilter\0228\n\010property\030\001 "
-          + "\001(\0132&.google.datastore.v1.PropertyRefere"
-          + "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr"
-          + "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g"
-          + "oogle.datastore.v1.Value\"\225\001\n\010Operator\022\030\n"
-          + "\024OPERATOR_UNSPECIFIED\020\000\022\r\n\tLESS_THAN\020\001\022\026"
-          + "\n\022LESS_THAN_OR_EQUAL\020\002\022\020\n\014GREATER_THAN\020\003"
-          + "\022\031\n\025GREATER_THAN_OR_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020"
-          + "\n\014HAS_ANCESTOR\020\013\"\245\002\n\010GqlQuery\022\024\n\014query_s"
-          + "tring\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001(\010\022H\n\016n"
-          + "amed_bindings\030\005 \003(\01320.google.datastore.v"
-          + "1.GqlQuery.NamedBindingsEntry\022C\n\023positio"
-          + "nal_bindings\030\004 \003(\0132&.google.datastore.v1"
-          + ".GqlQueryParameter\032\\\n\022NamedBindingsEntry"
-          + "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da"
-          + "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ"
-          + "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da"
-          + "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016"
-          + "parameter_type\"\336\003\n\020QueryResultBatch\022\027\n\017s"
-          + "kipped_results\030\006 \001(\005\022\026\n\016skipped_cursor\030\003"
-          + " \001(\014\022H\n\022entity_result_type\030\001 \001(\0162,.googl"
-          + "e.datastore.v1.EntityResult.ResultType\0229"
-          + "\n\016entity_results\030\002 \003(\0132!.google.datastor"
-          + "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n"
-          + "\014more_results\030\005 \001(\01625.google.datastore.v"
-          + "1.QueryResultBatch.MoreResultsType\022\030\n\020sn"
-          + "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType"
-          + "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N"
-          + "OT_FINISHED\020\001\022\034\n\030MORE_RESULTS_AFTER_LIMI"
-          + "T\020\002\022\035\n\031MORE_RESULTS_AFTER_CURSOR\020\004\022\023\n\017NO"
-          + "_MORE_RESULTS\020\003B\235\001\n\027com.google.datastore"
-          + ".v1B\nQueryProtoP\001Z\n\017p" +
+      "roperty_filter\030\002 \001(\0132#.google.datastore." +
+      "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C" +
+      "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data" +
+      "store.v1.CompositeFilter.Operator\022,\n\007fil" +
+      "ters\030\002 \003(\0132\033.google.datastore.v1.Filter\"" +
+      "-\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED\020\000\022\007\n" +
+      "\003AND\020\001\"\307\002\n\016PropertyFilter\0228\n\010property\030\001 " +
+      "\001(\0132&.google.datastore.v1.PropertyRefere" +
+      "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr" +
+      "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g" +
+      "oogle.datastore.v1.Value\"\225\001\n\010Operator\022\030\n" +
+      "\024OPERATOR_UNSPECIFIED\020\000\022\r\n\tLESS_THAN\020\001\022\026" +
+      "\n\022LESS_THAN_OR_EQUAL\020\002\022\020\n\014GREATER_THAN\020\003" +
+      "\022\031\n\025GREATER_THAN_OR_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020" +
+      "\n\014HAS_ANCESTOR\020\013\"\245\002\n\010GqlQuery\022\024\n\014query_s" +
+      "tring\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001(\010\022H\n\016n" +
+      "amed_bindings\030\005 \003(\01320.google.datastore.v" +
+      "1.GqlQuery.NamedBindingsEntry\022C\n\023positio" +
+      "nal_bindings\030\004 \003(\0132&.google.datastore.v1" +
+      ".GqlQueryParameter\032\\\n\022NamedBindingsEntry" +
+      "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da" +
+      "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ" +
+      "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da" +
+      "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016" +
+      "parameter_type\"\336\003\n\020QueryResultBatch\022\027\n\017s" +
+      "kipped_results\030\006 \001(\005\022\026\n\016skipped_cursor\030\003" +
+      " \001(\014\022H\n\022entity_result_type\030\001 \001(\0162,.googl" +
+      "e.datastore.v1.EntityResult.ResultType\0229" +
+      "\n\016entity_results\030\002 \003(\0132!.google.datastor" +
+      "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n" +
+      "\014more_results\030\005 \001(\01625.google.datastore.v" +
+      "1.QueryResultBatch.MoreResultsType\022\030\n\020sn" +
+      "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType" +
+      "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N" +
+      "OT_FINISHED\020\001\022\034\n\030MORE_RESULTS_AFTER_LIMI" +
+      "T\020\002\022\035\n\031MORE_RESULTS_AFTER_CURSOR\020\004\022\023\n\017NO" +
+      "_MORE_RESULTS\020\003B\235\001\n\027com.google.datastore" +
+      ".v1B\nQueryProtoP\001Z
  * A batch of results produced by a query.
  * 

  *
  * Protobuf type {@code google.datastore.v1.QueryResultBatch}
  */
-public final class QueryResultBatch extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class QueryResultBatch extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.QueryResultBatch)
     QueryResultBatchOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use QueryResultBatch.newBuilder() to construct.
   private QueryResultBatch(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private QueryResultBatch() {
     skippedCursor_ = com.google.protobuf.ByteString.EMPTY;
     entityResultType_ = 0;
@@ -47,15 +44,16 @@ private QueryResultBatch() {
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new QueryResultBatch();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private QueryResultBatch(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -75,64 +73,61 @@ private QueryResultBatch(
           case 0:
             done = true;
             break;
-          case 8:
-            {
-              int rawValue = input.readEnum();
+          case 8: {
+            int rawValue = input.readEnum();
 
-              entityResultType_ = rawValue;
-              break;
-            }
-          case 18:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                entityResults_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              entityResults_.add(
-                  input.readMessage(
-                      com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
-              break;
-            }
-          case 26:
-            {
-              skippedCursor_ = input.readBytes();
-              break;
-            }
-          case 34:
-            {
-              endCursor_ = input.readBytes();
-              break;
+            entityResultType_ = rawValue;
+            break;
+          }
+          case 18: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              entityResults_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
             }
-          case 40:
-            {
-              int rawValue = input.readEnum();
+            entityResults_.add(
+                input.readMessage(com.google.datastore.v1.EntityResult.parser(), extensionRegistry));
+            break;
+          }
+          case 26: {
 
-              moreResults_ = rawValue;
-              break;
-            }
-          case 48:
-            {
-              skippedResults_ = input.readInt32();
-              break;
-            }
-          case 56:
-            {
-              snapshotVersion_ = input.readInt64();
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            skippedCursor_ = input.readBytes();
+            break;
+          }
+          case 34: {
+
+            endCursor_ = input.readBytes();
+            break;
+          }
+          case 40: {
+            int rawValue = input.readEnum();
+
+            moreResults_ = rawValue;
+            break;
+          }
+          case 48: {
+
+            skippedResults_ = input.readInt32();
+            break;
+          }
+          case 56: {
+
+            snapshotVersion_ = input.readInt64();
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) != 0)) {
         entityResults_ = java.util.Collections.unmodifiableList(entityResults_);
@@ -141,35 +136,29 @@ private QueryResultBatch(
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_QueryResultBatch_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.QueryProto
-        .internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable
+    return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.QueryResultBatch.class,
-            com.google.datastore.v1.QueryResultBatch.Builder.class);
+            com.google.datastore.v1.QueryResultBatch.class, com.google.datastore.v1.QueryResultBatch.Builder.class);
   }
 
   /**
-   *
-   *
    * 
    * The possible values for the `more_results` field.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.QueryResultBatch.MoreResultsType}
    */
-  public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
+  public enum MoreResultsType
+      implements com.google.protobuf.ProtocolMessageEnum {
     /**
-     *
-     *
      * 
      * Unspecified. This value is never used.
      * 

@@ -178,8 +167,6 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      */
     MORE_RESULTS_TYPE_UNSPECIFIED(0),
     /**
-     *
-     *
      * 
      * There may be additional batches to fetch from this query.
      * 

@@ -188,8 +175,6 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      */
     NOT_FINISHED(1),
     /**
-     *
-     *
      * 
      * The query is finished, but there may be more results after the limit.
      * 

@@ -198,8 +183,6 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      */
     MORE_RESULTS_AFTER_LIMIT(2),
     /**
-     *
-     *
      * 
      * The query is finished, but there may be more results after the end
      * cursor.
@@ -209,8 +192,6 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      */
     MORE_RESULTS_AFTER_CURSOR(4),
     /**
-     *
-     *
      * 
      * The query is finished, and there are no more results.
      * 

@@ -222,8 +203,6 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
     ;
 
     /**
-     *
-     *
      * 
      * Unspecified. This value is never used.
      * 

@@ -232,8 +211,6 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int MORE_RESULTS_TYPE_UNSPECIFIED_VALUE = 0;
     /**
-     *
-     *
      * 
      * There may be additional batches to fetch from this query.
      * 

@@ -242,8 +219,6 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int NOT_FINISHED_VALUE = 1;
     /**
-     *
-     *
      * 
      * The query is finished, but there may be more results after the limit.
      * 

@@ -252,8 +227,6 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int MORE_RESULTS_AFTER_LIMIT_VALUE = 2;
     /**
-     *
-     *
      * 
      * The query is finished, but there may be more results after the end
      * cursor.
@@ -263,8 +236,6 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int MORE_RESULTS_AFTER_CURSOR_VALUE = 4;
     /**
-     *
-     *
      * 
      * The query is finished, and there are no more results.
      * 

@@ -273,6 +244,7 @@ public enum MoreResultsType implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int NO_MORE_RESULTS_VALUE = 3;
 
+
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -297,42 +269,37 @@ public static MoreResultsType valueOf(int value) {
      */
     public static MoreResultsType forNumber(int value) {
       switch (value) {
-        case 0:
-          return MORE_RESULTS_TYPE_UNSPECIFIED;
-        case 1:
-          return NOT_FINISHED;
-        case 2:
-          return MORE_RESULTS_AFTER_LIMIT;
-        case 4:
-          return MORE_RESULTS_AFTER_CURSOR;
-        case 3:
-          return NO_MORE_RESULTS;
-        default:
-          return null;
+        case 0: return MORE_RESULTS_TYPE_UNSPECIFIED;
+        case 1: return NOT_FINISHED;
+        case 2: return MORE_RESULTS_AFTER_LIMIT;
+        case 4: return MORE_RESULTS_AFTER_CURSOR;
+        case 3: return NO_MORE_RESULTS;
+        default: return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
       return internalValueMap;
     }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        MoreResultsType> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public MoreResultsType findValueByNumber(int number) {
+              return MoreResultsType.forNumber(number);
+            }
+          };
 
-    private static final com.google.protobuf.Internal.EnumLiteMap
-        internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap() {
-              public MoreResultsType findValueByNumber(int number) {
-                return MoreResultsType.forNumber(number);
-              }
-            };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-
-    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
       return getDescriptor();
     }
-
-    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
       return com.google.datastore.v1.QueryResultBatch.getDescriptor().getEnumTypes().get(0);
     }
 
@@ -341,7 +308,8 @@ public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor
     public static MoreResultsType valueOf(
         com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -361,14 +329,11 @@ private MoreResultsType(int value) {
   public static final int SKIPPED_RESULTS_FIELD_NUMBER = 6;
   private int skippedResults_;
   /**
-   *
-   *
    * 
    * The number of results skipped, typically because of an offset.
    * 

    *
    * int32 skipped_results = 6;
-   *
    * @return The skippedResults.
    */
   public int getSkippedResults() {
@@ -378,15 +343,12 @@ public int getSkippedResults() {
   public static final int SKIPPED_CURSOR_FIELD_NUMBER = 3;
   private com.google.protobuf.ByteString skippedCursor_;
   /**
-   *
-   *
    * 
    * A cursor that points to the position after the last skipped result.
    * Will be set when `skipped_results` != 0.
    * 

    *
    * bytes skipped_cursor = 3;
-   *
    * @return The skippedCursor.
    */
   public com.google.protobuf.ByteString getSkippedCursor() {
@@ -396,42 +358,33 @@ public com.google.protobuf.ByteString getSkippedCursor() {
   public static final int ENTITY_RESULT_TYPE_FIELD_NUMBER = 1;
   private int entityResultType_;
   /**
-   *
-   *
    * 
    * The result type for every entity in `entity_results`.
    * 

    *
    * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
-   *
    * @return The enum numeric value on the wire for entityResultType.
    */
   public int getEntityResultTypeValue() {
     return entityResultType_;
   }
   /**
-   *
-   *
    * 
    * The result type for every entity in `entity_results`.
    * 

    *
    * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
-   *
    * @return The entityResultType.
    */
   public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.EntityResult.ResultType result =
-        com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
+    com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
     return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result;
   }
 
   public static final int ENTITY_RESULTS_FIELD_NUMBER = 2;
   private java.util.List entityResults_;
   /**
-   *
-   *
    * 
    * The results for this batch.
    * 

@@ -442,21 +395,17 @@ public java.util.List getEntityResultsList
     return entityResults_;
   }
   /**
-   *
-   *
    * 
    * The results for this batch.
    * 

    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
-  public java.util.List
+  public java.util.List 
       getEntityResultsOrBuilderList() {
     return entityResults_;
   }
   /**
-   *
-   *
    * 
    * The results for this batch.
    * 

@@ -467,8 +416,6 @@ public int getEntityResultsCount() {
     return entityResults_.size();
   }
   /**
-   *
-   *
    * 
    * The results for this batch.
    * 

@@ -479,29 +426,25 @@ public com.google.datastore.v1.EntityResult getEntityResults(int index) {
     return entityResults_.get(index);
   }
   /**
-   *
-   *
    * 
    * The results for this batch.
    * 

    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
-  public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(int index) {
+  public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(
+      int index) {
     return entityResults_.get(index);
   }
 
   public static final int END_CURSOR_FIELD_NUMBER = 4;
   private com.google.protobuf.ByteString endCursor_;
   /**
-   *
-   *
    * 
    * A cursor that points to the position after the last result in the batch.
    * 

    *
    * bytes end_cursor = 4;
-   *
    * @return The endCursor.
    */
   public com.google.protobuf.ByteString getEndCursor() {
@@ -511,44 +454,33 @@ public com.google.protobuf.ByteString getEndCursor() {
   public static final int MORE_RESULTS_FIELD_NUMBER = 5;
   private int moreResults_;
   /**
-   *
-   *
    * 
    * The state of the query after the current batch.
    * 

    *
    * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
-   *
    * @return The enum numeric value on the wire for moreResults.
    */
   public int getMoreResultsValue() {
     return moreResults_;
   }
   /**
-   *
-   *
    * 
    * The state of the query after the current batch.
    * 

    *
    * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
-   *
    * @return The moreResults.
    */
   public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
     @SuppressWarnings("deprecation")
-    com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
-        com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
-    return result == null
-        ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
-        : result;
+    com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
+    return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result;
   }
 
   public static final int SNAPSHOT_VERSION_FIELD_NUMBER = 7;
   private long snapshotVersion_;
   /**
-   *
-   *
    * 
    * The version number of the snapshot this batch was returned from.
    * This applies to the range of results from the query's `start_cursor` (or
@@ -561,7 +493,6 @@ public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults()
    * 

    *
    * int64 snapshot_version = 7;
-   *
    * @return The snapshotVersion.
    */
   public long getSnapshotVersion() {
@@ -569,7 +500,6 @@ public long getSnapshotVersion() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -581,9 +511,9 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (entityResultType_
-        != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (entityResultType_ != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) {
       output.writeEnum(1, entityResultType_);
     }
     for (int i = 0; i < entityResults_.size(); i++) {
@@ -595,9 +525,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!endCursor_.isEmpty()) {
       output.writeBytes(4, endCursor_);
     }
-    if (moreResults_
-        != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED
-            .getNumber()) {
+    if (moreResults_ != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED.getNumber()) {
       output.writeEnum(5, moreResults_);
     }
     if (skippedResults_ != 0) {
@@ -615,29 +543,33 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (entityResultType_
-        != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) {
-      size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, entityResultType_);
+    if (entityResultType_ != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, entityResultType_);
     }
     for (int i = 0; i < entityResults_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, entityResults_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, entityResults_.get(i));
     }
     if (!skippedCursor_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream.computeBytesSize(3, skippedCursor_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(3, skippedCursor_);
     }
     if (!endCursor_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream.computeBytesSize(4, endCursor_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(4, endCursor_);
     }
-    if (moreResults_
-        != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED
-            .getNumber()) {
-      size += com.google.protobuf.CodedOutputStream.computeEnumSize(5, moreResults_);
+    if (moreResults_ != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(5, moreResults_);
     }
     if (skippedResults_ != 0) {
-      size += com.google.protobuf.CodedOutputStream.computeInt32Size(6, skippedResults_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(6, skippedResults_);
     }
     if (snapshotVersion_ != 0L) {
-      size += com.google.protobuf.CodedOutputStream.computeInt64Size(7, snapshotVersion_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(7, snapshotVersion_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -647,20 +579,25 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.QueryResultBatch)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.QueryResultBatch other = (com.google.datastore.v1.QueryResultBatch) obj;
 
-    if (getSkippedResults() != other.getSkippedResults()) return false;
-    if (!getSkippedCursor().equals(other.getSkippedCursor())) return false;
+    if (getSkippedResults()
+        != other.getSkippedResults()) return false;
+    if (!getSkippedCursor()
+        .equals(other.getSkippedCursor())) return false;
     if (entityResultType_ != other.entityResultType_) return false;
-    if (!getEntityResultsList().equals(other.getEntityResultsList())) return false;
-    if (!getEndCursor().equals(other.getEndCursor())) return false;
+    if (!getEntityResultsList()
+        .equals(other.getEntityResultsList())) return false;
+    if (!getEndCursor()
+        .equals(other.getEndCursor())) return false;
     if (moreResults_ != other.moreResults_) return false;
-    if (getSnapshotVersion() != other.getSnapshotVersion()) return false;
+    if (getSnapshotVersion()
+        != other.getSnapshotVersion()) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -687,133 +624,125 @@ public int hashCode() {
     hash = (37 * hash) + MORE_RESULTS_FIELD_NUMBER;
     hash = (53 * hash) + moreResults_;
     hash = (37 * hash) + SNAPSHOT_VERSION_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getSnapshotVersion());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+        getSnapshotVersion());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
   }
 
-  public static com.google.datastore.v1.QueryResultBatch parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.QueryResultBatch parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.QueryResultBatch parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.QueryResultBatch parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.QueryResultBatch parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.QueryResultBatch parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.QueryResultBatch parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.QueryResultBatch parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.QueryResultBatch prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A batch of results produced by a query.
    * 

    *
    * Protobuf type {@code google.datastore.v1.QueryResultBatch}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.QueryResultBatch)
       com.google.datastore.v1.QueryResultBatchOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_QueryResultBatch_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.QueryResultBatch.class,
-              com.google.datastore.v1.QueryResultBatch.Builder.class);
+              com.google.datastore.v1.QueryResultBatch.class, com.google.datastore.v1.QueryResultBatch.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.QueryResultBatch.newBuilder()
@@ -821,17 +750,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getEntityResultsFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -857,9 +786,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.QueryProto
-          .internal_static_google_datastore_v1_QueryResultBatch_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor;
     }
 
     @java.lang.Override
@@ -878,8 +807,7 @@ public com.google.datastore.v1.QueryResultBatch build() {
 
     @java.lang.Override
     public com.google.datastore.v1.QueryResultBatch buildPartial() {
-      com.google.datastore.v1.QueryResultBatch result =
-          new com.google.datastore.v1.QueryResultBatch(this);
+      com.google.datastore.v1.QueryResultBatch result = new com.google.datastore.v1.QueryResultBatch(this);
       int from_bitField0_ = bitField0_;
       result.skippedResults_ = skippedResults_;
       result.skippedCursor_ = skippedCursor_;
@@ -904,39 +832,38 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.QueryResultBatch) {
-        return mergeFrom((com.google.datastore.v1.QueryResultBatch) other);
+        return mergeFrom((com.google.datastore.v1.QueryResultBatch)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -972,10 +899,9 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) {
             entityResultsBuilder_ = null;
             entityResults_ = other.entityResults_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            entityResultsBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getEntityResultsFieldBuilder()
-                    : null;
+            entityResultsBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getEntityResultsFieldBuilder() : null;
           } else {
             entityResultsBuilder_.addAllMessages(other.entityResults_);
           }
@@ -1018,55 +944,45 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
-    private int skippedResults_;
+    private int skippedResults_ ;
     /**
-     *
-     *
      * 
      * The number of results skipped, typically because of an offset.
      * 

      *
      * int32 skipped_results = 6;
-     *
      * @return The skippedResults.
      */
     public int getSkippedResults() {
       return skippedResults_;
     }
     /**
-     *
-     *
      * 
      * The number of results skipped, typically because of an offset.
      * 

      *
      * int32 skipped_results = 6;
-     *
      * @param value The skippedResults to set.
      * @return This builder for chaining.
      */
     public Builder setSkippedResults(int value) {
-
+      
       skippedResults_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The number of results skipped, typically because of an offset.
      * 

      *
      * int32 skipped_results = 6;
-     *
      * @return This builder for chaining.
      */
     public Builder clearSkippedResults() {
-
+      
       skippedResults_ = 0;
       onChanged();
       return this;
@@ -1074,56 +990,47 @@ public Builder clearSkippedResults() {
 
     private com.google.protobuf.ByteString skippedCursor_ = com.google.protobuf.ByteString.EMPTY;
     /**
-     *
-     *
      * 
      * A cursor that points to the position after the last skipped result.
      * Will be set when `skipped_results` != 0.
      * 

      *
      * bytes skipped_cursor = 3;
-     *
      * @return The skippedCursor.
      */
     public com.google.protobuf.ByteString getSkippedCursor() {
       return skippedCursor_;
     }
     /**
-     *
-     *
      * 
      * A cursor that points to the position after the last skipped result.
      * Will be set when `skipped_results` != 0.
      * 

      *
      * bytes skipped_cursor = 3;
-     *
      * @param value The skippedCursor to set.
      * @return This builder for chaining.
      */
     public Builder setSkippedCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       skippedCursor_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * A cursor that points to the position after the last skipped result.
      * Will be set when `skipped_results` != 0.
      * 

      *
      * bytes skipped_cursor = 3;
-     *
      * @return This builder for chaining.
      */
     public Builder clearSkippedCursor() {
-
+      
       skippedCursor_ = getDefaultInstance().getSkippedCursor();
       onChanged();
       return this;
@@ -1131,28 +1038,22 @@ public Builder clearSkippedCursor() {
 
     private int entityResultType_ = 0;
     /**
-     *
-     *
      * 
      * The result type for every entity in `entity_results`.
      * 

      *
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
-     *
      * @return The enum numeric value on the wire for entityResultType.
      */
     public int getEntityResultTypeValue() {
       return entityResultType_;
     }
     /**
-     *
-     *
      * 
      * The result type for every entity in `entity_results`.
      * 

      *
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
-     *
      * @param value The enum numeric value on the wire for entityResultType to set.
      * @return This builder for chaining.
      */
@@ -1162,31 +1063,24 @@ public Builder setEntityResultTypeValue(int value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The result type for every entity in `entity_results`.
      * 

      *
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
-     *
      * @return The entityResultType.
      */
     public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.EntityResult.ResultType result =
-          com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
+      com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
       return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result;
     }
     /**
-     *
-     *
      * 
      * The result type for every entity in `entity_results`.
      * 

      *
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
-     *
      * @param value The entityResultType to set.
      * @return This builder for chaining.
      */
@@ -1194,49 +1088,39 @@ public Builder setEntityResultType(com.google.datastore.v1.EntityResult.ResultTy
       if (value == null) {
         throw new NullPointerException();
       }
-
+      
       entityResultType_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The result type for every entity in `entity_results`.
      * 

      *
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
-     *
      * @return This builder for chaining.
      */
     public Builder clearEntityResultType() {
-
+      
       entityResultType_ = 0;
       onChanged();
       return this;
     }
 
     private java.util.List entityResults_ =
-        java.util.Collections.emptyList();
-
+      java.util.Collections.emptyList();
     private void ensureEntityResultsIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
-        entityResults_ =
-            new java.util.ArrayList(entityResults_);
+        entityResults_ = new java.util.ArrayList(entityResults_);
         bitField0_ |= 0x00000001;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.EntityResult,
-            com.google.datastore.v1.EntityResult.Builder,
-            com.google.datastore.v1.EntityResultOrBuilder>
-        entityResultsBuilder_;
+        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> entityResultsBuilder_;
 
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

@@ -1251,8 +1135,6 @@ public java.util.List getEntityResultsList
       }
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

@@ -1267,8 +1149,6 @@ public int getEntityResultsCount() {
       }
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

@@ -1283,15 +1163,14 @@ public com.google.datastore.v1.EntityResult getEntityResults(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public Builder setEntityResults(int index, com.google.datastore.v1.EntityResult value) {
+    public Builder setEntityResults(
+        int index, com.google.datastore.v1.EntityResult value) {
       if (entityResultsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1305,8 +1184,6 @@ public Builder setEntityResults(int index, com.google.datastore.v1.EntityResult
       return this;
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

@@ -1325,8 +1202,6 @@ public Builder setEntityResults(
       return this;
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

@@ -1347,15 +1222,14 @@ public Builder addEntityResults(com.google.datastore.v1.EntityResult value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public Builder addEntityResults(int index, com.google.datastore.v1.EntityResult value) {
+    public Builder addEntityResults(
+        int index, com.google.datastore.v1.EntityResult value) {
       if (entityResultsBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1369,15 +1243,14 @@ public Builder addEntityResults(int index, com.google.datastore.v1.EntityResult
       return this;
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public Builder addEntityResults(com.google.datastore.v1.EntityResult.Builder builderForValue) {
+    public Builder addEntityResults(
+        com.google.datastore.v1.EntityResult.Builder builderForValue) {
       if (entityResultsBuilder_ == null) {
         ensureEntityResultsIsMutable();
         entityResults_.add(builderForValue.build());
@@ -1388,8 +1261,6 @@ public Builder addEntityResults(com.google.datastore.v1.EntityResult.Builder bui
       return this;
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

@@ -1408,8 +1279,6 @@ public Builder addEntityResults(
       return this;
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

@@ -1420,7 +1289,8 @@ public Builder addAllEntityResults(
         java.lang.Iterable values) {
       if (entityResultsBuilder_ == null) {
         ensureEntityResultsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, entityResults_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, entityResults_);
         onChanged();
       } else {
         entityResultsBuilder_.addAllMessages(values);
@@ -1428,8 +1298,6 @@ public Builder addAllEntityResults(
       return this;
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

@@ -1447,8 +1315,6 @@ public Builder clearEntityResults() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

@@ -1466,44 +1332,39 @@ public Builder removeEntityResults(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public com.google.datastore.v1.EntityResult.Builder getEntityResultsBuilder(int index) {
+    public com.google.datastore.v1.EntityResult.Builder getEntityResultsBuilder(
+        int index) {
       return getEntityResultsFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(int index) {
+    public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(
+        int index) {
       if (entityResultsBuilder_ == null) {
-        return entityResults_.get(index);
-      } else {
+        return entityResults_.get(index);  } else {
         return entityResultsBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public java.util.List
-        getEntityResultsOrBuilderList() {
+    public java.util.List 
+         getEntityResultsOrBuilderList() {
       if (entityResultsBuilder_ != null) {
         return entityResultsBuilder_.getMessageOrBuilderList();
       } else {
@@ -1511,8 +1372,6 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(i
       }
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

@@ -1520,47 +1379,38 @@ public com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(i
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
     public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder() {
-      return getEntityResultsFieldBuilder()
-          .addBuilder(com.google.datastore.v1.EntityResult.getDefaultInstance());
+      return getEntityResultsFieldBuilder().addBuilder(
+          com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int index) {
-      return getEntityResultsFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.EntityResult.getDefaultInstance());
+    public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(
+        int index) {
+      return getEntityResultsFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.EntityResult.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * The results for this batch.
      * 

      *
      * repeated .google.datastore.v1.EntityResult entity_results = 2;
      */
-    public java.util.List
-        getEntityResultsBuilderList() {
+    public java.util.List 
+         getEntityResultsBuilderList() {
       return getEntityResultsFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.EntityResult,
-            com.google.datastore.v1.EntityResult.Builder,
-            com.google.datastore.v1.EntityResultOrBuilder>
+        com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder> 
         getEntityResultsFieldBuilder() {
       if (entityResultsBuilder_ == null) {
-        entityResultsBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.EntityResult,
-                com.google.datastore.v1.EntityResult.Builder,
-                com.google.datastore.v1.EntityResultOrBuilder>(
+        entityResultsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>(
                 entityResults_,
                 ((bitField0_ & 0x00000001) != 0),
                 getParentForChildren(),
@@ -1572,53 +1422,44 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int
 
     private com.google.protobuf.ByteString endCursor_ = com.google.protobuf.ByteString.EMPTY;
     /**
-     *
-     *
      * 
      * A cursor that points to the position after the last result in the batch.
      * 

      *
      * bytes end_cursor = 4;
-     *
      * @return The endCursor.
      */
     public com.google.protobuf.ByteString getEndCursor() {
       return endCursor_;
     }
     /**
-     *
-     *
      * 
      * A cursor that points to the position after the last result in the batch.
      * 

      *
      * bytes end_cursor = 4;
-     *
      * @param value The endCursor to set.
      * @return This builder for chaining.
      */
     public Builder setEndCursor(com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       endCursor_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * A cursor that points to the position after the last result in the batch.
      * 

      *
      * bytes end_cursor = 4;
-     *
      * @return This builder for chaining.
      */
     public Builder clearEndCursor() {
-
+      
       endCursor_ = getDefaultInstance().getEndCursor();
       onChanged();
       return this;
@@ -1626,28 +1467,22 @@ public Builder clearEndCursor() {
 
     private int moreResults_ = 0;
     /**
-     *
-     *
      * 
      * The state of the query after the current batch.
      * 

      *
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
-     *
      * @return The enum numeric value on the wire for moreResults.
      */
     public int getMoreResultsValue() {
       return moreResults_;
     }
     /**
-     *
-     *
      * 
      * The state of the query after the current batch.
      * 

      *
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
-     *
      * @param value The enum numeric value on the wire for moreResults to set.
      * @return This builder for chaining.
      */
@@ -1657,33 +1492,24 @@ public Builder setMoreResultsValue(int value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The state of the query after the current batch.
      * 

      *
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
-     *
      * @return The moreResults.
      */
     public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.QueryResultBatch.MoreResultsType result =
-          com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
-      return result == null
-          ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED
-          : result;
+      com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
+      return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result;
     }
     /**
-     *
-     *
      * 
      * The state of the query after the current batch.
      * 

      *
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
-     *
      * @param value The moreResults to set.
      * @return This builder for chaining.
      */
@@ -1691,33 +1517,28 @@ public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResul
       if (value == null) {
         throw new NullPointerException();
       }
-
+      
       moreResults_ = value.getNumber();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The state of the query after the current batch.
      * 

      *
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
-     *
      * @return This builder for chaining.
      */
     public Builder clearMoreResults() {
-
+      
       moreResults_ = 0;
       onChanged();
       return this;
     }
 
-    private long snapshotVersion_;
+    private long snapshotVersion_ ;
     /**
-     *
-     *
      * 
      * The version number of the snapshot this batch was returned from.
      * This applies to the range of results from the query's `start_cursor` (or
@@ -1730,15 +1551,12 @@ public Builder clearMoreResults() {
      * 

      *
      * int64 snapshot_version = 7;
-     *
      * @return The snapshotVersion.
      */
     public long getSnapshotVersion() {
       return snapshotVersion_;
     }
     /**
-     *
-     *
      * 
      * The version number of the snapshot this batch was returned from.
      * This applies to the range of results from the query's `start_cursor` (or
@@ -1751,19 +1569,16 @@ public long getSnapshotVersion() {
      * 

      *
      * int64 snapshot_version = 7;
-     *
      * @param value The snapshotVersion to set.
      * @return This builder for chaining.
      */
     public Builder setSnapshotVersion(long value) {
-
+      
       snapshotVersion_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The version number of the snapshot this batch was returned from.
      * This applies to the range of results from the query's `start_cursor` (or
@@ -1776,18 +1591,17 @@ public Builder setSnapshotVersion(long value) {
      * 

      *
      * int64 snapshot_version = 7;
-     *
      * @return This builder for chaining.
      */
     public Builder clearSnapshotVersion() {
-
+      
       snapshotVersion_ = 0L;
       onChanged();
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1797,12 +1611,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.QueryResultBatch)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.QueryResultBatch)
   private static final com.google.datastore.v1.QueryResultBatch DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.QueryResultBatch();
   }
@@ -1811,16 +1625,16 @@ public static com.google.datastore.v1.QueryResultBatch getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public QueryResultBatch parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new QueryResultBatch(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public QueryResultBatch parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new QueryResultBatch(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1835,4 +1649,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
index 1345bd9ad..bae2a3b92 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatchOrBuilder.java
@@ -18,76 +18,60 @@
 
 package com.google.datastore.v1;
 
-public interface QueryResultBatchOrBuilder
-    extends
+public interface QueryResultBatchOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.QueryResultBatch)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The number of results skipped, typically because of an offset.
    * 

    *
    * int32 skipped_results = 6;
-   *
    * @return The skippedResults.
    */
   int getSkippedResults();
 
   /**
-   *
-   *
    * 
    * A cursor that points to the position after the last skipped result.
    * Will be set when `skipped_results` != 0.
    * 

    *
    * bytes skipped_cursor = 3;
-   *
    * @return The skippedCursor.
    */
   com.google.protobuf.ByteString getSkippedCursor();
 
   /**
-   *
-   *
    * 
    * The result type for every entity in `entity_results`.
    * 

    *
    * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
-   *
    * @return The enum numeric value on the wire for entityResultType.
    */
   int getEntityResultTypeValue();
   /**
-   *
-   *
    * 
    * The result type for every entity in `entity_results`.
    * 

    *
    * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
-   *
    * @return The entityResultType.
    */
   com.google.datastore.v1.EntityResult.ResultType getEntityResultType();
 
   /**
-   *
-   *
    * 
    * The results for this batch.
    * 

    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
-  java.util.List getEntityResultsList();
+  java.util.List 
+      getEntityResultsList();
   /**
-   *
-   *
    * 
    * The results for this batch.
    * 

@@ -96,8 +80,6 @@ public interface QueryResultBatchOrBuilder
    */
   com.google.datastore.v1.EntityResult getEntityResults(int index);
   /**
-   *
-   *
    * 
    * The results for this batch.
    * 

@@ -106,68 +88,54 @@ public interface QueryResultBatchOrBuilder
    */
   int getEntityResultsCount();
   /**
-   *
-   *
    * 
    * The results for this batch.
    * 

    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
-  java.util.List
+  java.util.List 
       getEntityResultsOrBuilderList();
   /**
-   *
-   *
    * 
    * The results for this batch.
    * 

    *
    * repeated .google.datastore.v1.EntityResult entity_results = 2;
    */
-  com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(int index);
+  com.google.datastore.v1.EntityResultOrBuilder getEntityResultsOrBuilder(
+      int index);
 
   /**
-   *
-   *
    * 
    * A cursor that points to the position after the last result in the batch.
    * 

    *
    * bytes end_cursor = 4;
-   *
    * @return The endCursor.
    */
   com.google.protobuf.ByteString getEndCursor();
 
   /**
-   *
-   *
    * 
    * The state of the query after the current batch.
    * 

    *
    * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
-   *
    * @return The enum numeric value on the wire for moreResults.
    */
   int getMoreResultsValue();
   /**
-   *
-   *
    * 
    * The state of the query after the current batch.
    * 

    *
    * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
-   *
    * @return The moreResults.
    */
   com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults();
 
   /**
-   *
-   *
    * 
    * The version number of the snapshot this batch was returned from.
    * This applies to the range of results from the query's `start_cursor` (or
@@ -180,7 +148,6 @@ public interface QueryResultBatchOrBuilder
    * 

    *
    * int64 snapshot_version = 7;
-   *
    * @return The snapshotVersion.
    */
   long getSnapshotVersion();
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 92816e64e..ff3938c79 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -19,37 +19,36 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The options shared by read requests.
  * 

  *
  * Protobuf type {@code google.datastore.v1.ReadOptions}
  */
-public final class ReadOptions extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class ReadOptions extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ReadOptions)
     ReadOptionsOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use ReadOptions.newBuilder() to construct.
   private ReadOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private ReadOptions() {}
+  private ReadOptions() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new ReadOptions();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private ReadOptions(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -68,66 +67,59 @@ private ReadOptions(
           case 0:
             done = true;
             break;
-          case 8:
-            {
-              int rawValue = input.readEnum();
-              consistencyTypeCase_ = 1;
-              consistencyType_ = rawValue;
-              break;
-            }
-          case 18:
-            {
-              consistencyTypeCase_ = 2;
-              consistencyType_ = input.readBytes();
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+          case 8: {
+            int rawValue = input.readEnum();
+            consistencyTypeCase_ = 1;
+            consistencyType_ = rawValue;
+            break;
+          }
+          case 18: {
+            consistencyTypeCase_ = 2;
+            consistencyType_ = input.readBytes();
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_ReadOptions_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.ReadOptions.class,
-            com.google.datastore.v1.ReadOptions.Builder.class);
+            com.google.datastore.v1.ReadOptions.class, com.google.datastore.v1.ReadOptions.Builder.class);
   }
 
   /**
-   *
-   *
    * 
    * The possible values for read consistencies.
    * 

    *
    * Protobuf enum {@code google.datastore.v1.ReadOptions.ReadConsistency}
    */
-  public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum {
+  public enum ReadConsistency
+      implements com.google.protobuf.ProtocolMessageEnum {
     /**
-     *
-     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -136,8 +128,6 @@ public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum {
      */
     READ_CONSISTENCY_UNSPECIFIED(0),
     /**
-     *
-     *
      * 
      * Strong consistency.
      * 

@@ -146,8 +136,6 @@ public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum {
      */
     STRONG(1),
     /**
-     *
-     *
      * 
      * Eventual consistency.
      * 

@@ -159,8 +147,6 @@ public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum {
     ;
 
     /**
-     *
-     *
      * 
      * Unspecified. This value must not be used.
      * 

@@ -169,8 +155,6 @@ public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int READ_CONSISTENCY_UNSPECIFIED_VALUE = 0;
     /**
-     *
-     *
      * 
      * Strong consistency.
      * 

@@ -179,8 +163,6 @@ public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int STRONG_VALUE = 1;
     /**
-     *
-     *
      * 
      * Eventual consistency.
      * 

@@ -189,6 +171,7 @@ public enum ReadConsistency implements com.google.protobuf.ProtocolMessageEnum {
      */
     public static final int EVENTUAL_VALUE = 2;
 
+
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
         throw new java.lang.IllegalArgumentException(
@@ -213,38 +196,35 @@ public static ReadConsistency valueOf(int value) {
      */
     public static ReadConsistency forNumber(int value) {
       switch (value) {
-        case 0:
-          return READ_CONSISTENCY_UNSPECIFIED;
-        case 1:
-          return STRONG;
-        case 2:
-          return EVENTUAL;
-        default:
-          return null;
+        case 0: return READ_CONSISTENCY_UNSPECIFIED;
+        case 1: return STRONG;
+        case 2: return EVENTUAL;
+        default: return null;
       }
     }
 
-    public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() {
+    public static com.google.protobuf.Internal.EnumLiteMap
+        internalGetValueMap() {
       return internalValueMap;
     }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ReadConsistency> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap() {
+            public ReadConsistency findValueByNumber(int number) {
+              return ReadConsistency.forNumber(number);
+            }
+          };
 
-    private static final com.google.protobuf.Internal.EnumLiteMap
-        internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap() {
-              public ReadConsistency findValueByNumber(int number) {
-                return ReadConsistency.forNumber(number);
-              }
-            };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
       return getDescriptor().getValues().get(ordinal());
     }
-
-    public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
       return getDescriptor();
     }
-
-    public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
       return com.google.datastore.v1.ReadOptions.getDescriptor().getEnumTypes().get(0);
     }
 
@@ -253,7 +233,8 @@ public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor
     public static ReadConsistency valueOf(
         com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
       if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
       }
       if (desc.getIndex() == -1) {
         return UNRECOGNIZED;
@@ -272,16 +253,13 @@ private ReadConsistency(int value) {
 
   private int consistencyTypeCase_ = 0;
   private java.lang.Object consistencyType_;
-
   public enum ConsistencyTypeCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
+      implements com.google.protobuf.Internal.EnumLite,
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     READ_CONSISTENCY(1),
     TRANSACTION(2),
     CONSISTENCYTYPE_NOT_SET(0);
     private final int value;
-
     private ConsistencyTypeCase(int value) {
       this.value = value;
     }
@@ -297,37 +275,31 @@ public static ConsistencyTypeCase valueOf(int value) {
 
     public static ConsistencyTypeCase forNumber(int value) {
       switch (value) {
-        case 1:
-          return READ_CONSISTENCY;
-        case 2:
-          return TRANSACTION;
-        case 0:
-          return CONSISTENCYTYPE_NOT_SET;
-        default:
-          return null;
+        case 1: return READ_CONSISTENCY;
+        case 2: return TRANSACTION;
+        case 0: return CONSISTENCYTYPE_NOT_SET;
+        default: return null;
       }
     }
-
     public int getNumber() {
       return this.value;
     }
   };
 
-  public ConsistencyTypeCase getConsistencyTypeCase() {
-    return ConsistencyTypeCase.forNumber(consistencyTypeCase_);
+  public ConsistencyTypeCase
+  getConsistencyTypeCase() {
+    return ConsistencyTypeCase.forNumber(
+        consistencyTypeCase_);
   }
 
   public static final int READ_CONSISTENCY_FIELD_NUMBER = 1;
   /**
-   *
-   *
    * 
    * The non-transactional read consistency to use.
    * Cannot be set to `STRONG` for global queries.
    * 

    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
-   *
    * @return The enum numeric value on the wire for readConsistency.
    */
   public int getReadConsistencyValue() {
@@ -337,34 +309,26 @@ public int getReadConsistencyValue() {
     return 0;
   }
   /**
-   *
-   *
    * 
    * The non-transactional read consistency to use.
    * Cannot be set to `STRONG` for global queries.
    * 

    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
-   *
    * @return The readConsistency.
    */
   public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() {
     if (consistencyTypeCase_ == 1) {
       @SuppressWarnings("deprecation")
-      com.google.datastore.v1.ReadOptions.ReadConsistency result =
-          com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
-              (java.lang.Integer) consistencyType_);
-      return result == null
-          ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED
-          : result;
+      com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
+          (java.lang.Integer) consistencyType_);
+      return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result;
     }
     return com.google.datastore.v1.ReadOptions.ReadConsistency.READ_CONSISTENCY_UNSPECIFIED;
   }
 
   public static final int TRANSACTION_FIELD_NUMBER = 2;
   /**
-   *
-   *
    * 
    * The identifier of the transaction in which to read. A
    * transaction identifier is returned by a call to
@@ -372,7 +336,6 @@ public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency()
    * 

    *
    * bytes transaction = 2;
-   *
    * @return The transaction.
    */
   public com.google.protobuf.ByteString getTransaction() {
@@ -383,7 +346,6 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -395,12 +357,14 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (consistencyTypeCase_ == 1) {
       output.writeEnum(1, ((java.lang.Integer) consistencyType_));
     }
     if (consistencyTypeCase_ == 2) {
-      output.writeBytes(2, (com.google.protobuf.ByteString) consistencyType_);
+      output.writeBytes(
+          2, (com.google.protobuf.ByteString) consistencyType_);
     }
     unknownFields.writeTo(output);
   }
@@ -412,14 +376,13 @@ public int getSerializedSize() {
 
     size = 0;
     if (consistencyTypeCase_ == 1) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeEnumSize(
-              1, ((java.lang.Integer) consistencyType_));
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, ((java.lang.Integer) consistencyType_));
     }
     if (consistencyTypeCase_ == 2) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeBytesSize(
-              2, (com.google.protobuf.ByteString) consistencyType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(
+            2, (com.google.protobuf.ByteString) consistencyType_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -429,7 +392,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.ReadOptions)) {
       return super.equals(obj);
@@ -439,10 +402,12 @@ public boolean equals(final java.lang.Object obj) {
     if (!getConsistencyTypeCase().equals(other.getConsistencyTypeCase())) return false;
     switch (consistencyTypeCase_) {
       case 1:
-        if (getReadConsistencyValue() != other.getReadConsistencyValue()) return false;
+        if (getReadConsistencyValue()
+            != other.getReadConsistencyValue()) return false;
         break;
       case 2:
-        if (!getTransaction().equals(other.getTransaction())) return false;
+        if (!getTransaction()
+            .equals(other.getTransaction())) return false;
         break;
       case 0:
       default:
@@ -475,126 +440,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.ReadOptions parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.ReadOptions parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ReadOptions parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.ReadOptions parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.ReadOptions parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ReadOptions parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReadOptions parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ReadOptions parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReadOptions parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ReadOptions parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReadOptions parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ReadOptions parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReadOptions parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ReadOptions parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.ReadOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The options shared by read requests.
    * 

    *
    * Protobuf type {@code google.datastore.v1.ReadOptions}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.ReadOptions)
       com.google.datastore.v1.ReadOptionsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_ReadOptions_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.ReadOptions.class,
-              com.google.datastore.v1.ReadOptions.Builder.class);
+              com.google.datastore.v1.ReadOptions.class, com.google.datastore.v1.ReadOptions.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.ReadOptions.newBuilder()
@@ -602,15 +559,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -620,9 +578,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_ReadOptions_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor;
     }
 
     @java.lang.Override
@@ -657,39 +615,38 @@ public com.google.datastore.v1.ReadOptions buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ReadOptions) {
-        return mergeFrom((com.google.datastore.v1.ReadOptions) other);
+        return mergeFrom((com.google.datastore.v1.ReadOptions)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -699,20 +656,17 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.datastore.v1.ReadOptions other) {
       if (other == com.google.datastore.v1.ReadOptions.getDefaultInstance()) return this;
       switch (other.getConsistencyTypeCase()) {
-        case READ_CONSISTENCY:
-          {
-            setReadConsistencyValue(other.getReadConsistencyValue());
-            break;
-          }
-        case TRANSACTION:
-          {
-            setTransaction(other.getTransaction());
-            break;
-          }
-        case CONSISTENCYTYPE_NOT_SET:
-          {
-            break;
-          }
+        case READ_CONSISTENCY: {
+          setReadConsistencyValue(other.getReadConsistencyValue());
+          break;
+        }
+        case TRANSACTION: {
+          setTransaction(other.getTransaction());
+          break;
+        }
+        case CONSISTENCYTYPE_NOT_SET: {
+          break;
+        }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -742,12 +696,12 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int consistencyTypeCase_ = 0;
     private java.lang.Object consistencyType_;
-
-    public ConsistencyTypeCase getConsistencyTypeCase() {
-      return ConsistencyTypeCase.forNumber(consistencyTypeCase_);
+    public ConsistencyTypeCase
+        getConsistencyTypeCase() {
+      return ConsistencyTypeCase.forNumber(
+          consistencyTypeCase_);
     }
 
     public Builder clearConsistencyType() {
@@ -757,16 +711,14 @@ public Builder clearConsistencyType() {
       return this;
     }
 
+
     /**
-     *
-     *
      * 
      * The non-transactional read consistency to use.
      * Cannot be set to `STRONG` for global queries.
      * 

      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
-     *
      * @return The enum numeric value on the wire for readConsistency.
      */
     public int getReadConsistencyValue() {
@@ -776,15 +728,12 @@ public int getReadConsistencyValue() {
       return 0;
     }
     /**
-     *
-     *
      * 
      * The non-transactional read consistency to use.
      * Cannot be set to `STRONG` for global queries.
      * 

      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
-     *
      * @param value The enum numeric value on the wire for readConsistency to set.
      * @return This builder for chaining.
      */
@@ -795,39 +744,30 @@ public Builder setReadConsistencyValue(int value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The non-transactional read consistency to use.
      * Cannot be set to `STRONG` for global queries.
      * 

      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
-     *
      * @return The readConsistency.
      */
     public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() {
       if (consistencyTypeCase_ == 1) {
         @SuppressWarnings("deprecation")
-        com.google.datastore.v1.ReadOptions.ReadConsistency result =
-            com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
-                (java.lang.Integer) consistencyType_);
-        return result == null
-            ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED
-            : result;
+        com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
+            (java.lang.Integer) consistencyType_);
+        return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result;
       }
       return com.google.datastore.v1.ReadOptions.ReadConsistency.READ_CONSISTENCY_UNSPECIFIED;
     }
     /**
-     *
-     *
      * 
      * The non-transactional read consistency to use.
      * Cannot be set to `STRONG` for global queries.
      * 

      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
-     *
      * @param value The readConsistency to set.
      * @return This builder for chaining.
      */
@@ -841,15 +781,12 @@ public Builder setReadConsistency(com.google.datastore.v1.ReadOptions.ReadConsis
       return this;
     }
     /**
-     *
-     *
      * 
      * The non-transactional read consistency to use.
      * Cannot be set to `STRONG` for global queries.
      * 

      *
      * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
-     *
      * @return This builder for chaining.
      */
     public Builder clearReadConsistency() {
@@ -862,8 +799,6 @@ public Builder clearReadConsistency() {
     }
 
     /**
-     *
-     *
      * 
      * The identifier of the transaction in which to read. A
      * transaction identifier is returned by a call to
@@ -871,7 +806,6 @@ public Builder clearReadConsistency() {
      * 

      *
      * bytes transaction = 2;
-     *
      * @return The transaction.
      */
     public com.google.protobuf.ByteString getTransaction() {
@@ -881,8 +815,6 @@ public com.google.protobuf.ByteString getTransaction() {
       return com.google.protobuf.ByteString.EMPTY;
     }
     /**
-     *
-     *
      * 
      * The identifier of the transaction in which to read. A
      * transaction identifier is returned by a call to
@@ -890,22 +822,19 @@ public com.google.protobuf.ByteString getTransaction() {
      * 

      *
      * bytes transaction = 2;
-     *
      * @param value The transaction to set.
      * @return This builder for chaining.
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      consistencyTypeCase_ = 2;
+    throw new NullPointerException();
+  }
+  consistencyTypeCase_ = 2;
       consistencyType_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The identifier of the transaction in which to read. A
      * transaction identifier is returned by a call to
@@ -913,7 +842,6 @@ public Builder setTransaction(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes transaction = 2;
-     *
      * @return This builder for chaining.
      */
     public Builder clearTransaction() {
@@ -924,9 +852,9 @@ public Builder clearTransaction() {
       }
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -936,12 +864,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.ReadOptions)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.ReadOptions)
   private static final com.google.datastore.v1.ReadOptions DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.ReadOptions();
   }
@@ -950,16 +878,16 @@ public static com.google.datastore.v1.ReadOptions getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public ReadOptions parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ReadOptions(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public ReadOptions parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ReadOptions(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -974,4 +902,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java
index 182cde5d9..6c2dfd593 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptionsOrBuilder.java
@@ -18,41 +18,32 @@
 
 package com.google.datastore.v1;
 
-public interface ReadOptionsOrBuilder
-    extends
+public interface ReadOptionsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.ReadOptions)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The non-transactional read consistency to use.
    * Cannot be set to `STRONG` for global queries.
    * 

    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
-   *
    * @return The enum numeric value on the wire for readConsistency.
    */
   int getReadConsistencyValue();
   /**
-   *
-   *
    * 
    * The non-transactional read consistency to use.
    * Cannot be set to `STRONG` for global queries.
    * 

    *
    * .google.datastore.v1.ReadOptions.ReadConsistency read_consistency = 1;
-   *
    * @return The readConsistency.
    */
   com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency();
 
   /**
-   *
-   *
    * 
    * The identifier of the transaction in which to read. A
    * transaction identifier is returned by a call to
@@ -60,7 +51,6 @@ public interface ReadOptionsOrBuilder
    * 

    *
    * bytes transaction = 2;
-   *
    * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
index da2f1ed94..a261c83d3 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
@@ -19,24 +19,21 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.ReserveIdsRequest}
  */
-public final class ReserveIdsRequest extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class ReserveIdsRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ReserveIdsRequest)
     ReserveIdsRequestOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use ReserveIdsRequest.newBuilder() to construct.
   private ReserveIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private ReserveIdsRequest() {
     projectId_ = "";
     databaseId_ = "";
@@ -45,15 +42,16 @@ private ReserveIdsRequest() {
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new ReserveIdsRequest();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private ReserveIdsRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -73,42 +71,41 @@ private ReserveIdsRequest(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                keys_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              keys_.add(input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
-              break;
+          case 10: {
+            if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              keys_ = new java.util.ArrayList();
+              mutable_bitField0_ |= 0x00000001;
             }
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+            keys_.add(
+                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
+            break;
+          }
+          case 66: {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              projectId_ = s;
-              break;
-            }
-          case 74:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+            projectId_ = s;
+            break;
+          }
+          case 74: {
+            java.lang.String s = input.readStringRequireUtf8();
 
-              databaseId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            databaseId_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000001) != 0)) {
         keys_ = java.util.Collections.unmodifiableList(keys_);
@@ -117,33 +114,27 @@ private ReserveIdsRequest(
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.ReserveIdsRequest.class,
-            com.google.datastore.v1.ReserveIdsRequest.Builder.class);
+            com.google.datastore.v1.ReserveIdsRequest.class, com.google.datastore.v1.ReserveIdsRequest.Builder.class);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   public java.lang.String getProjectId() {
@@ -151,28 +142,28 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  public com.google.protobuf.ByteString getProjectIdBytes() {
+  public com.google.protobuf.ByteString
+      getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -183,14 +174,11 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   public static final int DATABASE_ID_FIELD_NUMBER = 9;
   private volatile java.lang.Object databaseId_;
   /**
-   *
-   *
    * 
    * If not empty, the ID of the database against which to make the request.
    * 

    *
    * string database_id = 9;
-   *
    * @return The databaseId.
    */
   public java.lang.String getDatabaseId() {
@@ -198,28 +186,28 @@ public java.lang.String getDatabaseId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       databaseId_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * If not empty, the ID of the database against which to make the request.
    * 

    *
    * string database_id = 9;
-   *
    * @return The bytes for databaseId.
    */
-  public com.google.protobuf.ByteString getDatabaseIdBytes() {
+  public com.google.protobuf.ByteString
+      getDatabaseIdBytes() {
     java.lang.Object ref = databaseId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       databaseId_ = b;
       return b;
     } else {
@@ -230,78 +218,64 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
   public static final int KEYS_FIELD_NUMBER = 1;
   private java.util.List keys_;
   /**
-   *
-   *
    * 
    * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    */
   public java.util.List getKeysList() {
     return keys_;
   }
   /**
-   *
-   *
    * 
    * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    */
-  public java.util.List getKeysOrBuilderList() {
+  public java.util.List 
+      getKeysOrBuilderList() {
     return keys_;
   }
   /**
-   *
-   *
    * 
    * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    */
   public int getKeysCount() {
     return keys_.size();
   }
   /**
-   *
-   *
    * 
    * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    */
   public com.google.datastore.v1.Key getKeys(int index) {
     return keys_.get(index);
   }
   /**
-   *
-   *
    * 
    * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    */
-  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
+  public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
+      int index) {
     return keys_.get(index);
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -313,7 +287,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     for (int i = 0; i < keys_.size(); i++) {
       output.writeMessage(1, keys_.get(i));
     }
@@ -333,7 +308,8 @@ public int getSerializedSize() {
 
     size = 0;
     for (int i = 0; i < keys_.size(); i++) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i));
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, keys_.get(i));
     }
     if (!getProjectIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
@@ -349,17 +325,19 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.ReserveIdsRequest)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.ReserveIdsRequest other =
-        (com.google.datastore.v1.ReserveIdsRequest) obj;
+    com.google.datastore.v1.ReserveIdsRequest other = (com.google.datastore.v1.ReserveIdsRequest) obj;
 
-    if (!getProjectId().equals(other.getProjectId())) return false;
-    if (!getDatabaseId().equals(other.getDatabaseId())) return false;
-    if (!getKeysList().equals(other.getKeysList())) return false;
+    if (!getProjectId()
+        .equals(other.getProjectId())) return false;
+    if (!getDatabaseId()
+        .equals(other.getDatabaseId())) return false;
+    if (!getKeysList()
+        .equals(other.getKeysList())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -384,127 +362,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.ReserveIdsRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.ReserveIdsRequest parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.ReserveIdsRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ReserveIdsRequest parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.ReserveIdsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The request for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.ReserveIdsRequest}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.ReserveIdsRequest)
       com.google.datastore.v1.ReserveIdsRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.ReserveIdsRequest.class,
-              com.google.datastore.v1.ReserveIdsRequest.Builder.class);
+              com.google.datastore.v1.ReserveIdsRequest.class, com.google.datastore.v1.ReserveIdsRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.ReserveIdsRequest.newBuilder()
@@ -512,17 +481,17 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
         getKeysFieldBuilder();
       }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -540,9 +509,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
     }
 
     @java.lang.Override
@@ -561,8 +530,7 @@ public com.google.datastore.v1.ReserveIdsRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.ReserveIdsRequest buildPartial() {
-      com.google.datastore.v1.ReserveIdsRequest result =
-          new com.google.datastore.v1.ReserveIdsRequest(this);
+      com.google.datastore.v1.ReserveIdsRequest result = new com.google.datastore.v1.ReserveIdsRequest(this);
       int from_bitField0_ = bitField0_;
       result.projectId_ = projectId_;
       result.databaseId_ = databaseId_;
@@ -583,39 +551,38 @@ public com.google.datastore.v1.ReserveIdsRequest buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ReserveIdsRequest) {
-        return mergeFrom((com.google.datastore.v1.ReserveIdsRequest) other);
+        return mergeFrom((com.google.datastore.v1.ReserveIdsRequest)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -650,10 +617,9 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) {
             keysBuilder_ = null;
             keys_ = other.keys_;
             bitField0_ = (bitField0_ & ~0x00000001);
-            keysBuilder_ =
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
-                    ? getKeysFieldBuilder()
-                    : null;
+            keysBuilder_ = 
+              com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                 getKeysFieldBuilder() : null;
           } else {
             keysBuilder_.addAllMessages(other.keys_);
           }
@@ -687,25 +653,22 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int bitField0_;
 
     private java.lang.Object projectId_ = "";
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -714,21 +677,20 @@ public java.lang.String getProjectId() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The bytes for projectId.
      */
-    public com.google.protobuf.ByteString getProjectIdBytes() {
+    public com.google.protobuf.ByteString
+        getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -736,61 +698,54 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectId(java.lang.String value) {
+    public Builder setProjectId(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
+      
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The bytes for projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       projectId_ = value;
       onChanged();
       return this;
@@ -798,20 +753,18 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
 
     private java.lang.Object databaseId_ = "";
     /**
-     *
-     *
      * 
      * If not empty, the ID of the database against which to make the request.
      * 

      *
      * string database_id = 9;
-     *
      * @return The databaseId.
      */
     public java.lang.String getDatabaseId() {
       java.lang.Object ref = databaseId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         databaseId_ = s;
         return s;
@@ -820,21 +773,20 @@ public java.lang.String getDatabaseId() {
       }
     }
     /**
-     *
-     *
      * 
      * If not empty, the ID of the database against which to make the request.
      * 

      *
      * string database_id = 9;
-     *
      * @return The bytes for databaseId.
      */
-    public com.google.protobuf.ByteString getDatabaseIdBytes() {
+    public com.google.protobuf.ByteString
+        getDatabaseIdBytes() {
       java.lang.Object ref = databaseId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         databaseId_ = b;
         return b;
       } else {
@@ -842,91 +794,78 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * If not empty, the ID of the database against which to make the request.
      * 

      *
      * string database_id = 9;
-     *
      * @param value The databaseId to set.
      * @return This builder for chaining.
      */
-    public Builder setDatabaseId(java.lang.String value) {
+    public Builder setDatabaseId(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       databaseId_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * If not empty, the ID of the database against which to make the request.
      * 

      *
      * string database_id = 9;
-     *
      * @return This builder for chaining.
      */
     public Builder clearDatabaseId() {
-
+      
       databaseId_ = getDefaultInstance().getDatabaseId();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * If not empty, the ID of the database against which to make the request.
      * 

      *
      * string database_id = 9;
-     *
      * @param value The bytes for databaseId to set.
      * @return This builder for chaining.
      */
-    public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
+    public Builder setDatabaseIdBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       databaseId_ = value;
       onChanged();
       return this;
     }
 
-    private java.util.List keys_ = java.util.Collections.emptyList();
-
+    private java.util.List keys_ =
+      java.util.Collections.emptyList();
     private void ensureKeysIsMutable() {
       if (!((bitField0_ & 0x00000001) != 0)) {
         keys_ = new java.util.ArrayList(keys_);
         bitField0_ |= 0x00000001;
-      }
+       }
     }
 
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
-        keysBuilder_;
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keysBuilder_;
 
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
     public java.util.List getKeysList() {
       if (keysBuilder_ == null) {
@@ -936,15 +875,12 @@ public java.util.List getKeysList() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
     public int getKeysCount() {
       if (keysBuilder_ == null) {
@@ -954,15 +890,12 @@ public int getKeysCount() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
     public com.google.datastore.v1.Key getKeys(int index) {
       if (keysBuilder_ == null) {
@@ -972,17 +905,15 @@ public com.google.datastore.v1.Key getKeys(int index) {
       }
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder setKeys(int index, com.google.datastore.v1.Key value) {
+    public Builder setKeys(
+        int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -996,17 +927,15 @@ public Builder setKeys(int index, com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKeys(
+        int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.set(index, builderForValue.build());
@@ -1017,15 +946,12 @@ public Builder setKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
     public Builder addKeys(com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
@@ -1041,17 +967,15 @@ public Builder addKeys(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder addKeys(int index, com.google.datastore.v1.Key value) {
+    public Builder addKeys(
+        int index, com.google.datastore.v1.Key value) {
       if (keysBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -1065,17 +989,15 @@ public Builder addKeys(int index, com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(
+        com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(builderForValue.build());
@@ -1086,17 +1008,15 @@ public Builder addKeys(com.google.datastore.v1.Key.Builder builderForValue) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder addKeys(
+        int index, com.google.datastore.v1.Key.Builder builderForValue) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
         keys_.add(index, builderForValue.build());
@@ -1107,20 +1027,19 @@ public Builder addKeys(int index, com.google.datastore.v1.Key.Builder builderFor
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
-    public Builder addAllKeys(java.lang.Iterable values) {
+    public Builder addAllKeys(
+        java.lang.Iterable values) {
       if (keysBuilder_ == null) {
         ensureKeysIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(values, keys_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, keys_);
         onChanged();
       } else {
         keysBuilder_.addAllMessages(values);
@@ -1128,15 +1047,12 @@ public Builder addAllKeys(java.lang.Iterable
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
     public Builder clearKeys() {
       if (keysBuilder_ == null) {
@@ -1149,15 +1065,12 @@ public Builder clearKeys() {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
     public Builder removeKeys(int index) {
       if (keysBuilder_ == null) {
@@ -1170,49 +1083,42 @@ public Builder removeKeys(int index) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
-    public com.google.datastore.v1.Key.Builder getKeysBuilder(int index) {
+    public com.google.datastore.v1.Key.Builder getKeysBuilder(
+        int index) {
       return getKeysFieldBuilder().getBuilder(index);
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
-    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index) {
+    public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
+        int index) {
       if (keysBuilder_ == null) {
-        return keys_.get(index);
-      } else {
+        return keys_.get(index);  } else {
         return keysBuilder_.getMessageOrBuilder(index);
       }
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
-    public java.util.List getKeysOrBuilderList() {
+    public java.util.List 
+         getKeysOrBuilderList() {
       if (keysBuilder_ != null) {
         return keysBuilder_.getMessageOrBuilderList();
       } else {
@@ -1220,68 +1126,59 @@ public java.util.List getKeysOrB
       }
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
     public com.google.datastore.v1.Key.Builder addKeysBuilder() {
-      return getKeysFieldBuilder().addBuilder(com.google.datastore.v1.Key.getDefaultInstance());
+      return getKeysFieldBuilder().addBuilder(
+          com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
-    public com.google.datastore.v1.Key.Builder addKeysBuilder(int index) {
-      return getKeysFieldBuilder()
-          .addBuilder(index, com.google.datastore.v1.Key.getDefaultInstance());
+    public com.google.datastore.v1.Key.Builder addKeysBuilder(
+        int index) {
+      return getKeysFieldBuilder().addBuilder(
+          index, com.google.datastore.v1.Key.getDefaultInstance());
     }
     /**
-     *
-     *
      * 
      * Required. A list of keys with complete key paths whose numeric IDs should not be
      * auto-allocated.
      * 

      *
-     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-     * 
+     * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
      */
-    public java.util.List getKeysBuilderList() {
+    public java.util.List 
+         getKeysBuilderList() {
       return getKeysFieldBuilder().getBuilderList();
     }
-
     private com.google.protobuf.RepeatedFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
         getKeysFieldBuilder() {
       if (keysBuilder_ == null) {
-        keysBuilder_ =
-            new com.google.protobuf.RepeatedFieldBuilderV3<
-                com.google.datastore.v1.Key,
-                com.google.datastore.v1.Key.Builder,
-                com.google.datastore.v1.KeyOrBuilder>(
-                keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean());
+        keysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+                keys_,
+                ((bitField0_ & 0x00000001) != 0),
+                getParentForChildren(),
+                isClean());
         keys_ = null;
       }
       return keysBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1291,12 +1188,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.ReserveIdsRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.ReserveIdsRequest)
   private static final com.google.datastore.v1.ReserveIdsRequest DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.ReserveIdsRequest();
   }
@@ -1305,16 +1202,16 @@ public static com.google.datastore.v1.ReserveIdsRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public ReserveIdsRequest parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ReserveIdsRequest(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public ReserveIdsRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ReserveIdsRequest(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1329,4 +1226,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java
index 5f226316a..9345faef5 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java
@@ -18,119 +18,96 @@
 
 package com.google.datastore.v1;
 
-public interface ReserveIdsRequestOrBuilder
-    extends
+public interface ReserveIdsRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.ReserveIdsRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  com.google.protobuf.ByteString getProjectIdBytes();
+  com.google.protobuf.ByteString
+      getProjectIdBytes();
 
   /**
-   *
-   *
    * 
    * If not empty, the ID of the database against which to make the request.
    * 

    *
    * string database_id = 9;
-   *
    * @return The databaseId.
    */
   java.lang.String getDatabaseId();
   /**
-   *
-   *
    * 
    * If not empty, the ID of the database against which to make the request.
    * 

    *
    * string database_id = 9;
-   *
    * @return The bytes for databaseId.
    */
-  com.google.protobuf.ByteString getDatabaseIdBytes();
+  com.google.protobuf.ByteString
+      getDatabaseIdBytes();
 
   /**
-   *
-   *
    * 
    * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    */
-  java.util.List getKeysList();
+  java.util.List 
+      getKeysList();
   /**
-   *
-   *
    * 
    * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    */
   com.google.datastore.v1.Key getKeys(int index);
   /**
-   *
-   *
    * 
    * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    */
   int getKeysCount();
   /**
-   *
-   *
    * 
    * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    */
-  java.util.List getKeysOrBuilderList();
+  java.util.List 
+      getKeysOrBuilderList();
   /**
-   *
-   *
    * 
    * Required. A list of keys with complete key paths whose numeric IDs should not be
    * auto-allocated.
    * 

    *
-   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
-   * 
+   * repeated .google.datastore.v1.Key keys = 1 [(.google.api.field_behavior) = REQUIRED];
    */
-  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(int index);
+  com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
+      int index);
 }
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
index 7952b8ed6..ed7e2f9e4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
@@ -19,37 +19,36 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
  * 

  *
  * Protobuf type {@code google.datastore.v1.ReserveIdsResponse}
  */
-public final class ReserveIdsResponse extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class ReserveIdsResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.ReserveIdsResponse)
     ReserveIdsResponseOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use ReserveIdsResponse.newBuilder() to construct.
   private ReserveIdsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private ReserveIdsResponse() {}
+  private ReserveIdsResponse() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new ReserveIdsResponse();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private ReserveIdsResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -68,42 +67,39 @@ private ReserveIdsResponse(
           case 0:
             done = true;
             break;
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.ReserveIdsResponse.class,
-            com.google.datastore.v1.ReserveIdsResponse.Builder.class);
+            com.google.datastore.v1.ReserveIdsResponse.class, com.google.datastore.v1.ReserveIdsResponse.Builder.class);
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -115,7 +111,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
@@ -133,13 +130,12 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.ReserveIdsResponse)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.ReserveIdsResponse other =
-        (com.google.datastore.v1.ReserveIdsResponse) obj;
+    com.google.datastore.v1.ReserveIdsResponse other = (com.google.datastore.v1.ReserveIdsResponse) obj;
 
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
@@ -157,127 +153,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.ReserveIdsResponse parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.ReserveIdsResponse parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.ReserveIdsResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ReserveIdsResponse parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.ReserveIdsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The response for [Datastore.ReserveIds][google.datastore.v1.Datastore.ReserveIds].
    * 

    *
    * Protobuf type {@code google.datastore.v1.ReserveIdsResponse}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.ReserveIdsResponse)
       com.google.datastore.v1.ReserveIdsResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.ReserveIdsResponse.class,
-              com.google.datastore.v1.ReserveIdsResponse.Builder.class);
+              com.google.datastore.v1.ReserveIdsResponse.class, com.google.datastore.v1.ReserveIdsResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.ReserveIdsResponse.newBuilder()
@@ -285,15 +272,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -301,9 +289,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
     }
 
     @java.lang.Override
@@ -322,8 +310,7 @@ public com.google.datastore.v1.ReserveIdsResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.ReserveIdsResponse buildPartial() {
-      com.google.datastore.v1.ReserveIdsResponse result =
-          new com.google.datastore.v1.ReserveIdsResponse(this);
+      com.google.datastore.v1.ReserveIdsResponse result = new com.google.datastore.v1.ReserveIdsResponse(this);
       onBuilt();
       return result;
     }
@@ -332,39 +319,38 @@ public com.google.datastore.v1.ReserveIdsResponse buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ReserveIdsResponse) {
-        return mergeFrom((com.google.datastore.v1.ReserveIdsResponse) other);
+        return mergeFrom((com.google.datastore.v1.ReserveIdsResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -401,9 +387,9 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -413,12 +399,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.ReserveIdsResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.ReserveIdsResponse)
   private static final com.google.datastore.v1.ReserveIdsResponse DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.ReserveIdsResponse();
   }
@@ -427,16 +413,16 @@ public static com.google.datastore.v1.ReserveIdsResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public ReserveIdsResponse parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ReserveIdsResponse(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public ReserveIdsResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ReserveIdsResponse(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -451,4 +437,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
index 97be709a2..faa97aee0 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponseOrBuilder.java
@@ -18,7 +18,7 @@
 
 package com.google.datastore.v1;
 
-public interface ReserveIdsResponseOrBuilder
-    extends
+public interface ReserveIdsResponseOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.ReserveIdsResponse)
-    com.google.protobuf.MessageOrBuilder {}
+    com.google.protobuf.MessageOrBuilder {
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
index 8737207de..ecd63fc54 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
@@ -19,24 +19,21 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The request for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
  * 

  *
  * Protobuf type {@code google.datastore.v1.RollbackRequest}
  */
-public final class RollbackRequest extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class RollbackRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RollbackRequest)
     RollbackRequestOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use RollbackRequest.newBuilder() to construct.
   private RollbackRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private RollbackRequest() {
     projectId_ = "";
     transaction_ = com.google.protobuf.ByteString.EMPTY;
@@ -44,15 +41,16 @@ private RollbackRequest() {
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new RollbackRequest();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private RollbackRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -71,63 +69,57 @@ private RollbackRequest(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              transaction_ = input.readBytes();
-              break;
-            }
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
+          case 10: {
 
-              projectId_ = s;
-              break;
-            }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            transaction_ = input.readBytes();
+            break;
+          }
+          case 66: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            projectId_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_RollbackRequest_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.RollbackRequest.class,
-            com.google.datastore.v1.RollbackRequest.Builder.class);
+            com.google.datastore.v1.RollbackRequest.class, com.google.datastore.v1.RollbackRequest.Builder.class);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   public java.lang.String getProjectId() {
@@ -135,28 +127,28 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  public com.google.protobuf.ByteString getProjectIdBytes() {
+  public com.google.protobuf.ByteString
+      getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -167,15 +159,12 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   public static final int TRANSACTION_FIELD_NUMBER = 1;
   private com.google.protobuf.ByteString transaction_;
   /**
-   *
-   *
    * 
    * Required. The transaction identifier, returned by a call to
    * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
    * bytes transaction = 1 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The transaction.
    */
   public com.google.protobuf.ByteString getTransaction() {
@@ -183,7 +172,6 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -195,7 +183,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (!transaction_.isEmpty()) {
       output.writeBytes(1, transaction_);
     }
@@ -212,7 +201,8 @@ public int getSerializedSize() {
 
     size = 0;
     if (!transaction_.isEmpty()) {
-      size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, transaction_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(1, transaction_);
     }
     if (!getProjectIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
@@ -225,15 +215,17 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.RollbackRequest)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.RollbackRequest other = (com.google.datastore.v1.RollbackRequest) obj;
 
-    if (!getProjectId().equals(other.getProjectId())) return false;
-    if (!getTransaction().equals(other.getTransaction())) return false;
+    if (!getProjectId()
+        .equals(other.getProjectId())) return false;
+    if (!getTransaction()
+        .equals(other.getTransaction())) return false;
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
   }
@@ -254,127 +246,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.RollbackRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.RollbackRequest parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RollbackRequest parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RollbackRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RollbackRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RollbackRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RollbackRequest parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RollbackRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RollbackRequest parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.RollbackRequest parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.RollbackRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RollbackRequest parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RollbackRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RollbackRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.RollbackRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The request for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
    * 

    *
    * Protobuf type {@code google.datastore.v1.RollbackRequest}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.RollbackRequest)
       com.google.datastore.v1.RollbackRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RollbackRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.RollbackRequest.class,
-              com.google.datastore.v1.RollbackRequest.Builder.class);
+              com.google.datastore.v1.RollbackRequest.class, com.google.datastore.v1.RollbackRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.RollbackRequest.newBuilder()
@@ -382,15 +365,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -402,9 +386,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RollbackRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor;
     }
 
     @java.lang.Override
@@ -423,8 +407,7 @@ public com.google.datastore.v1.RollbackRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.RollbackRequest buildPartial() {
-      com.google.datastore.v1.RollbackRequest result =
-          new com.google.datastore.v1.RollbackRequest(this);
+      com.google.datastore.v1.RollbackRequest result = new com.google.datastore.v1.RollbackRequest(this);
       result.projectId_ = projectId_;
       result.transaction_ = transaction_;
       onBuilt();
@@ -435,39 +418,38 @@ public com.google.datastore.v1.RollbackRequest buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RollbackRequest) {
-        return mergeFrom((com.google.datastore.v1.RollbackRequest) other);
+        return mergeFrom((com.google.datastore.v1.RollbackRequest)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -514,20 +496,18 @@ public Builder mergeFrom(
 
     private java.lang.Object projectId_ = "";
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -536,21 +516,20 @@ public java.lang.String getProjectId() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The bytes for projectId.
      */
-    public com.google.protobuf.ByteString getProjectIdBytes() {
+    public com.google.protobuf.ByteString
+        getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -558,61 +537,54 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectId(java.lang.String value) {
+    public Builder setProjectId(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
+      
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The bytes for projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       projectId_ = value;
       onChanged();
       return this;
@@ -620,63 +592,54 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
 
     private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
     /**
-     *
-     *
      * 
      * Required. The transaction identifier, returned by a call to
      * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
      * 

      *
      * bytes transaction = 1 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The transaction.
      */
     public com.google.protobuf.ByteString getTransaction() {
       return transaction_;
     }
     /**
-     *
-     *
      * 
      * Required. The transaction identifier, returned by a call to
      * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
      * 

      *
      * bytes transaction = 1 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The transaction to set.
      * @return This builder for chaining.
      */
     public Builder setTransaction(com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       transaction_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The transaction identifier, returned by a call to
      * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
      * 

      *
      * bytes transaction = 1 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return This builder for chaining.
      */
     public Builder clearTransaction() {
-
+      
       transaction_ = getDefaultInstance().getTransaction();
       onChanged();
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -686,12 +649,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.RollbackRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.RollbackRequest)
   private static final com.google.datastore.v1.RollbackRequest DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.RollbackRequest();
   }
@@ -700,16 +663,16 @@ public static com.google.datastore.v1.RollbackRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public RollbackRequest parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new RollbackRequest(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public RollbackRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new RollbackRequest(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -724,4 +687,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java
index f79f60fab..75f1250e7 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java
@@ -18,46 +18,37 @@
 
 package com.google.datastore.v1;
 
-public interface RollbackRequestOrBuilder
-    extends
+public interface RollbackRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.RollbackRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  com.google.protobuf.ByteString getProjectIdBytes();
+  com.google.protobuf.ByteString
+      getProjectIdBytes();
 
   /**
-   *
-   *
    * 
    * Required. The transaction identifier, returned by a call to
    * [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
    * 

    *
    * bytes transaction = 1 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The transaction.
    */
   com.google.protobuf.ByteString getTransaction();
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
index aaad534c1..492e7ef7c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
@@ -19,8 +19,6 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
  * (an empty message).
@@ -28,29 +26,30 @@
  *
  * Protobuf type {@code google.datastore.v1.RollbackResponse}
  */
-public final class RollbackResponse extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class RollbackResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RollbackResponse)
     RollbackResponseOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use RollbackResponse.newBuilder() to construct.
   private RollbackResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private RollbackResponse() {}
+  private RollbackResponse() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new RollbackResponse();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private RollbackResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -69,42 +68,39 @@ private RollbackResponse(
           case 0:
             done = true;
             break;
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_RollbackResponse_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.RollbackResponse.class,
-            com.google.datastore.v1.RollbackResponse.Builder.class);
+            com.google.datastore.v1.RollbackResponse.class, com.google.datastore.v1.RollbackResponse.Builder.class);
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -116,7 +112,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
@@ -134,7 +131,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.RollbackResponse)) {
       return super.equals(obj);
@@ -157,104 +154,97 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.RollbackResponse parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.RollbackResponse parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RollbackResponse parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RollbackResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RollbackResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RollbackResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RollbackResponse parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RollbackResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RollbackResponse parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.RollbackResponse parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.RollbackResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RollbackResponse parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RollbackResponse parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RollbackResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.RollbackResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback].
    * (an empty message).
@@ -262,23 +252,21 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * Protobuf type {@code google.datastore.v1.RollbackResponse}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.RollbackResponse)
       com.google.datastore.v1.RollbackResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RollbackResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.RollbackResponse.class,
-              com.google.datastore.v1.RollbackResponse.Builder.class);
+              com.google.datastore.v1.RollbackResponse.class, com.google.datastore.v1.RollbackResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.RollbackResponse.newBuilder()
@@ -286,15 +274,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -302,9 +291,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RollbackResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor;
     }
 
     @java.lang.Override
@@ -323,8 +312,7 @@ public com.google.datastore.v1.RollbackResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.RollbackResponse buildPartial() {
-      com.google.datastore.v1.RollbackResponse result =
-          new com.google.datastore.v1.RollbackResponse(this);
+      com.google.datastore.v1.RollbackResponse result = new com.google.datastore.v1.RollbackResponse(this);
       onBuilt();
       return result;
     }
@@ -333,39 +321,38 @@ public com.google.datastore.v1.RollbackResponse buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RollbackResponse) {
-        return mergeFrom((com.google.datastore.v1.RollbackResponse) other);
+        return mergeFrom((com.google.datastore.v1.RollbackResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -402,9 +389,9 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -414,12 +401,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.RollbackResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.RollbackResponse)
   private static final com.google.datastore.v1.RollbackResponse DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.RollbackResponse();
   }
@@ -428,16 +415,16 @@ public static com.google.datastore.v1.RollbackResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public RollbackResponse parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new RollbackResponse(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public RollbackResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new RollbackResponse(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -452,4 +439,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index 9adc811de..97bcedc04 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -18,7 +18,7 @@
 
 package com.google.datastore.v1;
 
-public interface RollbackResponseOrBuilder
-    extends
+public interface RollbackResponseOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.RollbackResponse)
-    com.google.protobuf.MessageOrBuilder {}
+    com.google.protobuf.MessageOrBuilder {
+}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
index a40f59105..b017ae6af 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
@@ -19,39 +19,37 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The request for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
  * 

  *
  * Protobuf type {@code google.datastore.v1.RunQueryRequest}
  */
-public final class RunQueryRequest extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class RunQueryRequest extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RunQueryRequest)
     RunQueryRequestOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use RunQueryRequest.newBuilder() to construct.
   private RunQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
   private RunQueryRequest() {
     projectId_ = "";
   }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new RunQueryRequest();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private RunQueryRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -70,121 +68,107 @@ private RunQueryRequest(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
-              if (readOptions_ != null) {
-                subBuilder = readOptions_.toBuilder();
-              }
-              readOptions_ =
-                  input.readMessage(
-                      com.google.datastore.v1.ReadOptions.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(readOptions_);
-                readOptions_ = subBuilder.buildPartial();
-              }
-
-              break;
+          case 10: {
+            com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
+            if (readOptions_ != null) {
+              subBuilder = readOptions_.toBuilder();
             }
-          case 18:
-            {
-              com.google.datastore.v1.PartitionId.Builder subBuilder = null;
-              if (partitionId_ != null) {
-                subBuilder = partitionId_.toBuilder();
-              }
-              partitionId_ =
-                  input.readMessage(
-                      com.google.datastore.v1.PartitionId.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(partitionId_);
-                partitionId_ = subBuilder.buildPartial();
-              }
-
-              break;
+            readOptions_ = input.readMessage(com.google.datastore.v1.ReadOptions.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(readOptions_);
+              readOptions_ = subBuilder.buildPartial();
             }
-          case 26:
-            {
-              com.google.datastore.v1.Query.Builder subBuilder = null;
-              if (queryTypeCase_ == 3) {
-                subBuilder = ((com.google.datastore.v1.Query) queryType_).toBuilder();
-              }
-              queryType_ =
-                  input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Query) queryType_);
-                queryType_ = subBuilder.buildPartial();
-              }
-              queryTypeCase_ = 3;
-              break;
+
+            break;
+          }
+          case 18: {
+            com.google.datastore.v1.PartitionId.Builder subBuilder = null;
+            if (partitionId_ != null) {
+              subBuilder = partitionId_.toBuilder();
             }
-          case 58:
-            {
-              com.google.datastore.v1.GqlQuery.Builder subBuilder = null;
-              if (queryTypeCase_ == 7) {
-                subBuilder = ((com.google.datastore.v1.GqlQuery) queryType_).toBuilder();
-              }
-              queryType_ =
-                  input.readMessage(com.google.datastore.v1.GqlQuery.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.GqlQuery) queryType_);
-                queryType_ = subBuilder.buildPartial();
-              }
-              queryTypeCase_ = 7;
-              break;
+            partitionId_ = input.readMessage(com.google.datastore.v1.PartitionId.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(partitionId_);
+              partitionId_ = subBuilder.buildPartial();
             }
-          case 66:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              projectId_ = s;
-              break;
+            break;
+          }
+          case 26: {
+            com.google.datastore.v1.Query.Builder subBuilder = null;
+            if (queryTypeCase_ == 3) {
+              subBuilder = ((com.google.datastore.v1.Query) queryType_).toBuilder();
+            }
+            queryType_ =
+                input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.Query) queryType_);
+              queryType_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            queryTypeCase_ = 3;
+            break;
+          }
+          case 58: {
+            com.google.datastore.v1.GqlQuery.Builder subBuilder = null;
+            if (queryTypeCase_ == 7) {
+              subBuilder = ((com.google.datastore.v1.GqlQuery) queryType_).toBuilder();
             }
+            queryType_ =
+                input.readMessage(com.google.datastore.v1.GqlQuery.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.GqlQuery) queryType_);
+              queryType_ = subBuilder.buildPartial();
+            }
+            queryTypeCase_ = 7;
+            break;
+          }
+          case 66: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            projectId_ = s;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_RunQueryRequest_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.RunQueryRequest.class,
-            com.google.datastore.v1.RunQueryRequest.Builder.class);
+            com.google.datastore.v1.RunQueryRequest.class, com.google.datastore.v1.RunQueryRequest.Builder.class);
   }
 
   private int queryTypeCase_ = 0;
   private java.lang.Object queryType_;
-
   public enum QueryTypeCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
+      implements com.google.protobuf.Internal.EnumLite,
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     QUERY(3),
     GQL_QUERY(7),
     QUERYTYPE_NOT_SET(0);
     private final int value;
-
     private QueryTypeCase(int value) {
       this.value = value;
     }
@@ -200,37 +184,31 @@ public static QueryTypeCase valueOf(int value) {
 
     public static QueryTypeCase forNumber(int value) {
       switch (value) {
-        case 3:
-          return QUERY;
-        case 7:
-          return GQL_QUERY;
-        case 0:
-          return QUERYTYPE_NOT_SET;
-        default:
-          return null;
+        case 3: return QUERY;
+        case 7: return GQL_QUERY;
+        case 0: return QUERYTYPE_NOT_SET;
+        default: return null;
       }
     }
-
     public int getNumber() {
       return this.value;
     }
   };
 
-  public QueryTypeCase getQueryTypeCase() {
-    return QueryTypeCase.forNumber(queryTypeCase_);
+  public QueryTypeCase
+  getQueryTypeCase() {
+    return QueryTypeCase.forNumber(
+        queryTypeCase_);
   }
 
   public static final int PROJECT_ID_FIELD_NUMBER = 8;
   private volatile java.lang.Object projectId_;
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   public java.lang.String getProjectId() {
@@ -238,28 +216,28 @@ public java.lang.String getProjectId() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       projectId_ = s;
       return s;
     }
   }
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  public com.google.protobuf.ByteString getProjectIdBytes() {
+  public com.google.protobuf.ByteString
+      getProjectIdBytes() {
     java.lang.Object ref = projectId_;
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       projectId_ = b;
       return b;
     } else {
@@ -270,8 +248,6 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
   public static final int PARTITION_ID_FIELD_NUMBER = 2;
   private com.google.datastore.v1.PartitionId partitionId_;
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -280,15 +256,12 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 2;
-   *
    * @return Whether the partitionId field is set.
    */
   public boolean hasPartitionId() {
     return partitionId_ != null;
   }
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -297,17 +270,12 @@ public boolean hasPartitionId() {
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 2;
-   *
    * @return The partitionId.
    */
   public com.google.datastore.v1.PartitionId getPartitionId() {
-    return partitionId_ == null
-        ? com.google.datastore.v1.PartitionId.getDefaultInstance()
-        : partitionId_;
+    return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
   }
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -324,38 +292,28 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
   public static final int READ_OPTIONS_FIELD_NUMBER = 1;
   private com.google.datastore.v1.ReadOptions readOptions_;
   /**
-   *
-   *
    * 
    * The options for this query.
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
-   *
    * @return Whether the readOptions field is set.
    */
   public boolean hasReadOptions() {
     return readOptions_ != null;
   }
   /**
-   *
-   *
    * 
    * The options for this query.
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
-   *
    * @return The readOptions.
    */
   public com.google.datastore.v1.ReadOptions getReadOptions() {
-    return readOptions_ == null
-        ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
-        : readOptions_;
+    return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
   }
   /**
-   *
-   *
    * 
    * The options for this query.
    * 

@@ -368,39 +326,31 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
 
   public static final int QUERY_FIELD_NUMBER = 3;
   /**
-   *
-   *
    * 
    * The query to run.
    * 

    *
    * .google.datastore.v1.Query query = 3;
-   *
    * @return Whether the query field is set.
    */
   public boolean hasQuery() {
     return queryTypeCase_ == 3;
   }
   /**
-   *
-   *
    * 
    * The query to run.
    * 

    *
    * .google.datastore.v1.Query query = 3;
-   *
    * @return The query.
    */
   public com.google.datastore.v1.Query getQuery() {
     if (queryTypeCase_ == 3) {
-      return (com.google.datastore.v1.Query) queryType_;
+       return (com.google.datastore.v1.Query) queryType_;
     }
     return com.google.datastore.v1.Query.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * The query to run.
    * 

@@ -409,46 +359,38 @@ public com.google.datastore.v1.Query getQuery() {
    */
   public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
     if (queryTypeCase_ == 3) {
-      return (com.google.datastore.v1.Query) queryType_;
+       return (com.google.datastore.v1.Query) queryType_;
     }
     return com.google.datastore.v1.Query.getDefaultInstance();
   }
 
   public static final int GQL_QUERY_FIELD_NUMBER = 7;
   /**
-   *
-   *
    * 
    * The GQL query to run.
    * 

    *
    * .google.datastore.v1.GqlQuery gql_query = 7;
-   *
    * @return Whether the gqlQuery field is set.
    */
   public boolean hasGqlQuery() {
     return queryTypeCase_ == 7;
   }
   /**
-   *
-   *
    * 
    * The GQL query to run.
    * 

    *
    * .google.datastore.v1.GqlQuery gql_query = 7;
-   *
    * @return The gqlQuery.
    */
   public com.google.datastore.v1.GqlQuery getGqlQuery() {
     if (queryTypeCase_ == 7) {
-      return (com.google.datastore.v1.GqlQuery) queryType_;
+       return (com.google.datastore.v1.GqlQuery) queryType_;
     }
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * The GQL query to run.
    * 

@@ -457,13 +399,12 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
    */
   public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
     if (queryTypeCase_ == 7) {
-      return (com.google.datastore.v1.GqlQuery) queryType_;
+       return (com.google.datastore.v1.GqlQuery) queryType_;
     }
     return com.google.datastore.v1.GqlQuery.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -475,7 +416,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (readOptions_ != null) {
       output.writeMessage(1, getReadOptions());
     }
@@ -501,20 +443,20 @@ public int getSerializedSize() {
 
     size = 0;
     if (readOptions_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadOptions());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getReadOptions());
     }
     if (partitionId_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPartitionId());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getPartitionId());
     }
     if (queryTypeCase_ == 3) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              3, (com.google.datastore.v1.Query) queryType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(3, (com.google.datastore.v1.Query) queryType_);
     }
     if (queryTypeCase_ == 7) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              7, (com.google.datastore.v1.GqlQuery) queryType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(7, (com.google.datastore.v1.GqlQuery) queryType_);
     }
     if (!getProjectIdBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
@@ -527,29 +469,34 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.RunQueryRequest)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.RunQueryRequest other = (com.google.datastore.v1.RunQueryRequest) obj;
 
-    if (!getProjectId().equals(other.getProjectId())) return false;
+    if (!getProjectId()
+        .equals(other.getProjectId())) return false;
     if (hasPartitionId() != other.hasPartitionId()) return false;
     if (hasPartitionId()) {
-      if (!getPartitionId().equals(other.getPartitionId())) return false;
+      if (!getPartitionId()
+          .equals(other.getPartitionId())) return false;
     }
     if (hasReadOptions() != other.hasReadOptions()) return false;
     if (hasReadOptions()) {
-      if (!getReadOptions().equals(other.getReadOptions())) return false;
+      if (!getReadOptions()
+          .equals(other.getReadOptions())) return false;
     }
     if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
     switch (queryTypeCase_) {
       case 3:
-        if (!getQuery().equals(other.getQuery())) return false;
+        if (!getQuery()
+            .equals(other.getQuery())) return false;
         break;
       case 7:
-        if (!getGqlQuery().equals(other.getGqlQuery())) return false;
+        if (!getGqlQuery()
+            .equals(other.getGqlQuery())) return false;
         break;
       case 0:
       default:
@@ -592,127 +539,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.RunQueryRequest parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.RunQueryRequest parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RunQueryRequest parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RunQueryRequest parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.RunQueryRequest parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.RunQueryRequest parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RunQueryRequest parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RunQueryRequest parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.RunQueryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The request for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
    * 

    *
    * Protobuf type {@code google.datastore.v1.RunQueryRequest}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.RunQueryRequest)
       com.google.datastore.v1.RunQueryRequestOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RunQueryRequest_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.RunQueryRequest.class,
-              com.google.datastore.v1.RunQueryRequest.Builder.class);
+              com.google.datastore.v1.RunQueryRequest.class, com.google.datastore.v1.RunQueryRequest.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.RunQueryRequest.newBuilder()
@@ -720,15 +658,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -752,9 +691,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RunQueryRequest_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor;
     }
 
     @java.lang.Override
@@ -773,8 +712,7 @@ public com.google.datastore.v1.RunQueryRequest build() {
 
     @java.lang.Override
     public com.google.datastore.v1.RunQueryRequest buildPartial() {
-      com.google.datastore.v1.RunQueryRequest result =
-          new com.google.datastore.v1.RunQueryRequest(this);
+      com.google.datastore.v1.RunQueryRequest result = new com.google.datastore.v1.RunQueryRequest(this);
       result.projectId_ = projectId_;
       if (partitionIdBuilder_ == null) {
         result.partitionId_ = partitionId_;
@@ -809,39 +747,38 @@ public com.google.datastore.v1.RunQueryRequest buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RunQueryRequest) {
-        return mergeFrom((com.google.datastore.v1.RunQueryRequest) other);
+        return mergeFrom((com.google.datastore.v1.RunQueryRequest)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -861,20 +798,17 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
         mergeReadOptions(other.getReadOptions());
       }
       switch (other.getQueryTypeCase()) {
-        case QUERY:
-          {
-            mergeQuery(other.getQuery());
-            break;
-          }
-        case GQL_QUERY:
-          {
-            mergeGqlQuery(other.getGqlQuery());
-            break;
-          }
-        case QUERYTYPE_NOT_SET:
-          {
-            break;
-          }
+        case QUERY: {
+          mergeQuery(other.getQuery());
+          break;
+        }
+        case GQL_QUERY: {
+          mergeGqlQuery(other.getGqlQuery());
+          break;
+        }
+        case QUERYTYPE_NOT_SET: {
+          break;
+        }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -904,12 +838,12 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int queryTypeCase_ = 0;
     private java.lang.Object queryType_;
-
-    public QueryTypeCase getQueryTypeCase() {
-      return QueryTypeCase.forNumber(queryTypeCase_);
+    public QueryTypeCase
+        getQueryTypeCase() {
+      return QueryTypeCase.forNumber(
+          queryTypeCase_);
     }
 
     public Builder clearQueryType() {
@@ -919,22 +853,21 @@ public Builder clearQueryType() {
       return this;
     }
 
+
     private java.lang.Object projectId_ = "";
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The projectId.
      */
     public java.lang.String getProjectId() {
       java.lang.Object ref = projectId_;
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         projectId_ = s;
         return s;
@@ -943,21 +876,20 @@ public java.lang.String getProjectId() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return The bytes for projectId.
      */
-    public com.google.protobuf.ByteString getProjectIdBytes() {
+    public com.google.protobuf.ByteString
+        getProjectIdBytes() {
       java.lang.Object ref = projectId_;
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         projectId_ = b;
         return b;
       } else {
@@ -965,61 +897,54 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectId(java.lang.String value) {
+    public Builder setProjectId(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-
+    throw new NullPointerException();
+  }
+  
       projectId_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @return This builder for chaining.
      */
     public Builder clearProjectId() {
-
+      
       projectId_ = getDefaultInstance().getProjectId();
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * Required. The ID of the project against which to make the request.
      * 

      *
      * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-     *
      * @param value The bytes for projectId to set.
      * @return This builder for chaining.
      */
-    public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
+    public Builder setProjectIdBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
       projectId_ = value;
       onChanged();
       return this;
@@ -1027,13 +952,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
 
     private com.google.datastore.v1.PartitionId partitionId_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PartitionId,
-            com.google.datastore.v1.PartitionId.Builder,
-            com.google.datastore.v1.PartitionIdOrBuilder>
-        partitionIdBuilder_;
+        com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> partitionIdBuilder_;
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1042,15 +962,12 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
      * 

      *
      * .google.datastore.v1.PartitionId partition_id = 2;
-     *
      * @return Whether the partitionId field is set.
      */
     public boolean hasPartitionId() {
       return partitionIdBuilder_ != null || partitionId_ != null;
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1059,21 +976,16 @@ public boolean hasPartitionId() {
      * 

      *
      * .google.datastore.v1.PartitionId partition_id = 2;
-     *
      * @return The partitionId.
      */
     public com.google.datastore.v1.PartitionId getPartitionId() {
       if (partitionIdBuilder_ == null) {
-        return partitionId_ == null
-            ? com.google.datastore.v1.PartitionId.getDefaultInstance()
-            : partitionId_;
+        return partitionId_ == null ? com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
       } else {
         return partitionIdBuilder_.getMessage();
       }
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1097,8 +1009,6 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1108,7 +1018,8 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId value) {
      *
      * .google.datastore.v1.PartitionId partition_id = 2;
      */
-    public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builderForValue) {
+    public Builder setPartitionId(
+        com.google.datastore.v1.PartitionId.Builder builderForValue) {
       if (partitionIdBuilder_ == null) {
         partitionId_ = builderForValue.build();
         onChanged();
@@ -1119,8 +1030,6 @@ public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builde
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1134,9 +1043,7 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       if (partitionIdBuilder_ == null) {
         if (partitionId_ != null) {
           partitionId_ =
-              com.google.datastore.v1.PartitionId.newBuilder(partitionId_)
-                  .mergeFrom(value)
-                  .buildPartial();
+            com.google.datastore.v1.PartitionId.newBuilder(partitionId_).mergeFrom(value).buildPartial();
         } else {
           partitionId_ = value;
         }
@@ -1148,8 +1055,6 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1171,8 +1076,6 @@ public Builder clearPartitionId() {
       return this;
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1183,13 +1086,11 @@ public Builder clearPartitionId() {
      * .google.datastore.v1.PartitionId partition_id = 2;
      */
     public com.google.datastore.v1.PartitionId.Builder getPartitionIdBuilder() {
-
+      
       onChanged();
       return getPartitionIdFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1203,14 +1104,11 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
       if (partitionIdBuilder_ != null) {
         return partitionIdBuilder_.getMessageOrBuilder();
       } else {
-        return partitionId_ == null
-            ? com.google.datastore.v1.PartitionId.getDefaultInstance()
-            : partitionId_;
+        return partitionId_ == null ?
+            com.google.datastore.v1.PartitionId.getDefaultInstance() : partitionId_;
       }
     }
     /**
-     *
-     *
      * 
      * Entities are partitioned into subsets, identified by a partition ID.
      * Queries are scoped to a single partition.
@@ -1221,17 +1119,14 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
      * .google.datastore.v1.PartitionId partition_id = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.PartitionId,
-            com.google.datastore.v1.PartitionId.Builder,
-            com.google.datastore.v1.PartitionIdOrBuilder>
+        com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder> 
         getPartitionIdFieldBuilder() {
       if (partitionIdBuilder_ == null) {
-        partitionIdBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.PartitionId,
-                com.google.datastore.v1.PartitionId.Builder,
-                com.google.datastore.v1.PartitionIdOrBuilder>(
-                getPartitionId(), getParentForChildren(), isClean());
+        partitionIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, com.google.datastore.v1.PartitionIdOrBuilder>(
+                getPartitionId(),
+                getParentForChildren(),
+                isClean());
         partitionId_ = null;
       }
       return partitionIdBuilder_;
@@ -1239,47 +1134,34 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
 
     private com.google.datastore.v1.ReadOptions readOptions_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ReadOptions,
-            com.google.datastore.v1.ReadOptions.Builder,
-            com.google.datastore.v1.ReadOptionsOrBuilder>
-        readOptionsBuilder_;
+        com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> readOptionsBuilder_;
     /**
-     *
-     *
      * 
      * The options for this query.
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
-     *
      * @return Whether the readOptions field is set.
      */
     public boolean hasReadOptions() {
       return readOptionsBuilder_ != null || readOptions_ != null;
     }
     /**
-     *
-     *
      * 
      * The options for this query.
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
-     *
      * @return The readOptions.
      */
     public com.google.datastore.v1.ReadOptions getReadOptions() {
       if (readOptionsBuilder_ == null) {
-        return readOptions_ == null
-            ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
-            : readOptions_;
+        return readOptions_ == null ? com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
       } else {
         return readOptionsBuilder_.getMessage();
       }
     }
     /**
-     *
-     *
      * 
      * The options for this query.
      * 

@@ -1300,15 +1182,14 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The options for this query.
      * 

      *
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
-    public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builderForValue) {
+    public Builder setReadOptions(
+        com.google.datastore.v1.ReadOptions.Builder builderForValue) {
       if (readOptionsBuilder_ == null) {
         readOptions_ = builderForValue.build();
         onChanged();
@@ -1319,8 +1200,6 @@ public Builder setReadOptions(com.google.datastore.v1.ReadOptions.Builder builde
       return this;
     }
     /**
-     *
-     *
      * 
      * The options for this query.
      * 

@@ -1331,9 +1210,7 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       if (readOptionsBuilder_ == null) {
         if (readOptions_ != null) {
           readOptions_ =
-              com.google.datastore.v1.ReadOptions.newBuilder(readOptions_)
-                  .mergeFrom(value)
-                  .buildPartial();
+            com.google.datastore.v1.ReadOptions.newBuilder(readOptions_).mergeFrom(value).buildPartial();
         } else {
           readOptions_ = value;
         }
@@ -1345,8 +1222,6 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The options for this query.
      * 

@@ -1365,8 +1240,6 @@ public Builder clearReadOptions() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The options for this query.
      * 

@@ -1374,13 +1247,11 @@ public Builder clearReadOptions() {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() {
-
+      
       onChanged();
       return getReadOptionsFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The options for this query.
      * 

@@ -1391,14 +1262,11 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
       if (readOptionsBuilder_ != null) {
         return readOptionsBuilder_.getMessageOrBuilder();
       } else {
-        return readOptions_ == null
-            ? com.google.datastore.v1.ReadOptions.getDefaultInstance()
-            : readOptions_;
+        return readOptions_ == null ?
+            com.google.datastore.v1.ReadOptions.getDefaultInstance() : readOptions_;
       }
     }
     /**
-     *
-     *
      * 
      * The options for this query.
      * 

@@ -1406,50 +1274,38 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() {
      * .google.datastore.v1.ReadOptions read_options = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ReadOptions,
-            com.google.datastore.v1.ReadOptions.Builder,
-            com.google.datastore.v1.ReadOptionsOrBuilder>
+        com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder> 
         getReadOptionsFieldBuilder() {
       if (readOptionsBuilder_ == null) {
-        readOptionsBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.ReadOptions,
-                com.google.datastore.v1.ReadOptions.Builder,
-                com.google.datastore.v1.ReadOptionsOrBuilder>(
-                getReadOptions(), getParentForChildren(), isClean());
+        readOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, com.google.datastore.v1.ReadOptionsOrBuilder>(
+                getReadOptions(),
+                getParentForChildren(),
+                isClean());
         readOptions_ = null;
       }
       return readOptionsBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Query,
-            com.google.datastore.v1.Query.Builder,
-            com.google.datastore.v1.QueryOrBuilder>
-        queryBuilder_;
+        com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> queryBuilder_;
     /**
-     *
-     *
      * 
      * The query to run.
      * 

      *
      * .google.datastore.v1.Query query = 3;
-     *
      * @return Whether the query field is set.
      */
     public boolean hasQuery() {
       return queryTypeCase_ == 3;
     }
     /**
-     *
-     *
      * 
      * The query to run.
      * 

      *
      * .google.datastore.v1.Query query = 3;
-     *
      * @return The query.
      */
     public com.google.datastore.v1.Query getQuery() {
@@ -1466,8 +1322,6 @@ public com.google.datastore.v1.Query getQuery() {
       }
     }
     /**
-     *
-     *
      * 
      * The query to run.
      * 

@@ -1488,15 +1342,14 @@ public Builder setQuery(com.google.datastore.v1.Query value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The query to run.
      * 

      *
      * .google.datastore.v1.Query query = 3;
      */
-    public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
+    public Builder setQuery(
+        com.google.datastore.v1.Query.Builder builderForValue) {
       if (queryBuilder_ == null) {
         queryType_ = builderForValue.build();
         onChanged();
@@ -1507,8 +1360,6 @@ public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The query to run.
      * 

@@ -1517,12 +1368,10 @@ public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
      */
     public Builder mergeQuery(com.google.datastore.v1.Query value) {
       if (queryBuilder_ == null) {
-        if (queryTypeCase_ == 3
-            && queryType_ != com.google.datastore.v1.Query.getDefaultInstance()) {
-          queryType_ =
-              com.google.datastore.v1.Query.newBuilder((com.google.datastore.v1.Query) queryType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (queryTypeCase_ == 3 &&
+            queryType_ != com.google.datastore.v1.Query.getDefaultInstance()) {
+          queryType_ = com.google.datastore.v1.Query.newBuilder((com.google.datastore.v1.Query) queryType_)
+              .mergeFrom(value).buildPartial();
         } else {
           queryType_ = value;
         }
@@ -1537,8 +1386,6 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The query to run.
      * 

@@ -1562,8 +1409,6 @@ public Builder clearQuery() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The query to run.
      * 

@@ -1574,8 +1419,6 @@ public com.google.datastore.v1.Query.Builder getQueryBuilder() {
       return getQueryFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The query to run.
      * 

@@ -1593,8 +1436,6 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * The query to run.
      * 

@@ -1602,56 +1443,43 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
      * .google.datastore.v1.Query query = 3;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Query,
-            com.google.datastore.v1.Query.Builder,
-            com.google.datastore.v1.QueryOrBuilder>
+        com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> 
         getQueryFieldBuilder() {
       if (queryBuilder_ == null) {
         if (!(queryTypeCase_ == 3)) {
           queryType_ = com.google.datastore.v1.Query.getDefaultInstance();
         }
-        queryBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Query,
-                com.google.datastore.v1.Query.Builder,
-                com.google.datastore.v1.QueryOrBuilder>(
-                (com.google.datastore.v1.Query) queryType_, getParentForChildren(), isClean());
+        queryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder>(
+                (com.google.datastore.v1.Query) queryType_,
+                getParentForChildren(),
+                isClean());
         queryType_ = null;
       }
       queryTypeCase_ = 3;
-      onChanged();
-      ;
+      onChanged();;
       return queryBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.GqlQuery,
-            com.google.datastore.v1.GqlQuery.Builder,
-            com.google.datastore.v1.GqlQueryOrBuilder>
-        gqlQueryBuilder_;
+        com.google.datastore.v1.GqlQuery, com.google.datastore.v1.GqlQuery.Builder, com.google.datastore.v1.GqlQueryOrBuilder> gqlQueryBuilder_;
     /**
-     *
-     *
      * 
      * The GQL query to run.
      * 

      *
      * .google.datastore.v1.GqlQuery gql_query = 7;
-     *
      * @return Whether the gqlQuery field is set.
      */
     public boolean hasGqlQuery() {
       return queryTypeCase_ == 7;
     }
     /**
-     *
-     *
      * 
      * The GQL query to run.
      * 

      *
      * .google.datastore.v1.GqlQuery gql_query = 7;
-     *
      * @return The gqlQuery.
      */
     public com.google.datastore.v1.GqlQuery getGqlQuery() {
@@ -1668,8 +1496,6 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
       }
     }
     /**
-     *
-     *
      * 
      * The GQL query to run.
      * 

@@ -1690,15 +1516,14 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The GQL query to run.
      * 

      *
      * .google.datastore.v1.GqlQuery gql_query = 7;
      */
-    public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForValue) {
+    public Builder setGqlQuery(
+        com.google.datastore.v1.GqlQuery.Builder builderForValue) {
       if (gqlQueryBuilder_ == null) {
         queryType_ = builderForValue.build();
         onChanged();
@@ -1709,8 +1534,6 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForVa
       return this;
     }
     /**
-     *
-     *
      * 
      * The GQL query to run.
      * 

@@ -1719,13 +1542,10 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForVa
      */
     public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) {
       if (gqlQueryBuilder_ == null) {
-        if (queryTypeCase_ == 7
-            && queryType_ != com.google.datastore.v1.GqlQuery.getDefaultInstance()) {
-          queryType_ =
-              com.google.datastore.v1.GqlQuery.newBuilder(
-                      (com.google.datastore.v1.GqlQuery) queryType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (queryTypeCase_ == 7 &&
+            queryType_ != com.google.datastore.v1.GqlQuery.getDefaultInstance()) {
+          queryType_ = com.google.datastore.v1.GqlQuery.newBuilder((com.google.datastore.v1.GqlQuery) queryType_)
+              .mergeFrom(value).buildPartial();
         } else {
           queryType_ = value;
         }
@@ -1740,8 +1560,6 @@ public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The GQL query to run.
      * 

@@ -1765,8 +1583,6 @@ public Builder clearGqlQuery() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The GQL query to run.
      * 

@@ -1777,8 +1593,6 @@ public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() {
       return getGqlQueryFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The GQL query to run.
      * 

@@ -1796,8 +1610,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * The GQL query to run.
      * 

@@ -1805,30 +1617,26 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
      * .google.datastore.v1.GqlQuery gql_query = 7;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.GqlQuery,
-            com.google.datastore.v1.GqlQuery.Builder,
-            com.google.datastore.v1.GqlQueryOrBuilder>
+        com.google.datastore.v1.GqlQuery, com.google.datastore.v1.GqlQuery.Builder, com.google.datastore.v1.GqlQueryOrBuilder> 
         getGqlQueryFieldBuilder() {
       if (gqlQueryBuilder_ == null) {
         if (!(queryTypeCase_ == 7)) {
           queryType_ = com.google.datastore.v1.GqlQuery.getDefaultInstance();
         }
-        gqlQueryBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.GqlQuery,
-                com.google.datastore.v1.GqlQuery.Builder,
-                com.google.datastore.v1.GqlQueryOrBuilder>(
-                (com.google.datastore.v1.GqlQuery) queryType_, getParentForChildren(), isClean());
+        gqlQueryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.GqlQuery, com.google.datastore.v1.GqlQuery.Builder, com.google.datastore.v1.GqlQueryOrBuilder>(
+                (com.google.datastore.v1.GqlQuery) queryType_,
+                getParentForChildren(),
+                isClean());
         queryType_ = null;
       }
       queryTypeCase_ = 7;
-      onChanged();
-      ;
+      onChanged();;
       return gqlQueryBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -1838,12 +1646,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.RunQueryRequest)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.RunQueryRequest)
   private static final com.google.datastore.v1.RunQueryRequest DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.RunQueryRequest();
   }
@@ -1852,16 +1660,16 @@ public static com.google.datastore.v1.RunQueryRequest getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public RunQueryRequest parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new RunQueryRequest(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public RunQueryRequest parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new RunQueryRequest(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -1876,4 +1684,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java
index 6fb3cad45..16e82ea1c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java
@@ -18,39 +18,31 @@
 
 package com.google.datastore.v1;
 
-public interface RunQueryRequestOrBuilder
-    extends
+public interface RunQueryRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.RunQueryRequest)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The projectId.
    */
   java.lang.String getProjectId();
   /**
-   *
-   *
    * 
    * Required. The ID of the project against which to make the request.
    * 

    *
    * string project_id = 8 [(.google.api.field_behavior) = REQUIRED];
-   *
    * @return The bytes for projectId.
    */
-  com.google.protobuf.ByteString getProjectIdBytes();
+  com.google.protobuf.ByteString
+      getProjectIdBytes();
 
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -59,13 +51,10 @@ public interface RunQueryRequestOrBuilder
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 2;
-   *
    * @return Whether the partitionId field is set.
    */
   boolean hasPartitionId();
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -74,13 +63,10 @@ public interface RunQueryRequestOrBuilder
    * 

    *
    * .google.datastore.v1.PartitionId partition_id = 2;
-   *
    * @return The partitionId.
    */
   com.google.datastore.v1.PartitionId getPartitionId();
   /**
-   *
-   *
    * 
    * Entities are partitioned into subsets, identified by a partition ID.
    * Queries are scoped to a single partition.
@@ -93,32 +79,24 @@ public interface RunQueryRequestOrBuilder
   com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder();
 
   /**
-   *
-   *
    * 
    * The options for this query.
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
-   *
    * @return Whether the readOptions field is set.
    */
   boolean hasReadOptions();
   /**
-   *
-   *
    * 
    * The options for this query.
    * 

    *
    * .google.datastore.v1.ReadOptions read_options = 1;
-   *
    * @return The readOptions.
    */
   com.google.datastore.v1.ReadOptions getReadOptions();
   /**
-   *
-   *
    * 
    * The options for this query.
    * 

@@ -128,32 +106,24 @@ public interface RunQueryRequestOrBuilder
   com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder();
 
   /**
-   *
-   *
    * 
    * The query to run.
    * 

    *
    * .google.datastore.v1.Query query = 3;
-   *
    * @return Whether the query field is set.
    */
   boolean hasQuery();
   /**
-   *
-   *
    * 
    * The query to run.
    * 

    *
    * .google.datastore.v1.Query query = 3;
-   *
    * @return The query.
    */
   com.google.datastore.v1.Query getQuery();
   /**
-   *
-   *
    * 
    * The query to run.
    * 

@@ -163,32 +133,24 @@ public interface RunQueryRequestOrBuilder
   com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder();
 
   /**
-   *
-   *
    * 
    * The GQL query to run.
    * 

    *
    * .google.datastore.v1.GqlQuery gql_query = 7;
-   *
    * @return Whether the gqlQuery field is set.
    */
   boolean hasGqlQuery();
   /**
-   *
-   *
    * 
    * The GQL query to run.
    * 

    *
    * .google.datastore.v1.GqlQuery gql_query = 7;
-   *
    * @return The gqlQuery.
    */
   com.google.datastore.v1.GqlQuery getGqlQuery();
   /**
-   *
-   *
    * 
    * The GQL query to run.
    * 

diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
index 7be8c3891..29d989382 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
@@ -19,37 +19,36 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
  * 

  *
  * Protobuf type {@code google.datastore.v1.RunQueryResponse}
  */
-public final class RunQueryResponse extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class RunQueryResponse extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.RunQueryResponse)
     RunQueryResponseOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use RunQueryResponse.newBuilder() to construct.
   private RunQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private RunQueryResponse() {}
+  private RunQueryResponse() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new RunQueryResponse();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private RunQueryResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -68,103 +67,89 @@ private RunQueryResponse(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              com.google.datastore.v1.QueryResultBatch.Builder subBuilder = null;
-              if (batch_ != null) {
-                subBuilder = batch_.toBuilder();
-              }
-              batch_ =
-                  input.readMessage(
-                      com.google.datastore.v1.QueryResultBatch.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(batch_);
-                batch_ = subBuilder.buildPartial();
-              }
-
-              break;
+          case 10: {
+            com.google.datastore.v1.QueryResultBatch.Builder subBuilder = null;
+            if (batch_ != null) {
+              subBuilder = batch_.toBuilder();
+            }
+            batch_ = input.readMessage(com.google.datastore.v1.QueryResultBatch.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(batch_);
+              batch_ = subBuilder.buildPartial();
             }
-          case 18:
-            {
-              com.google.datastore.v1.Query.Builder subBuilder = null;
-              if (query_ != null) {
-                subBuilder = query_.toBuilder();
-              }
-              query_ = input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(query_);
-                query_ = subBuilder.buildPartial();
-              }
-
-              break;
+
+            break;
+          }
+          case 18: {
+            com.google.datastore.v1.Query.Builder subBuilder = null;
+            if (query_ != null) {
+              subBuilder = query_.toBuilder();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            query_ = input.readMessage(com.google.datastore.v1.Query.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(query_);
+              query_ = subBuilder.buildPartial();
             }
+
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_RunQueryResponse_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.RunQueryResponse.class,
-            com.google.datastore.v1.RunQueryResponse.Builder.class);
+            com.google.datastore.v1.RunQueryResponse.class, com.google.datastore.v1.RunQueryResponse.Builder.class);
   }
 
   public static final int BATCH_FIELD_NUMBER = 1;
   private com.google.datastore.v1.QueryResultBatch batch_;
   /**
-   *
-   *
    * 
    * A batch of query results (always present).
    * 

    *
    * .google.datastore.v1.QueryResultBatch batch = 1;
-   *
    * @return Whether the batch field is set.
    */
   public boolean hasBatch() {
     return batch_ != null;
   }
   /**
-   *
-   *
    * 
    * A batch of query results (always present).
    * 

    *
    * .google.datastore.v1.QueryResultBatch batch = 1;
-   *
    * @return The batch.
    */
   public com.google.datastore.v1.QueryResultBatch getBatch() {
     return batch_ == null ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_;
   }
   /**
-   *
-   *
    * 
    * A batch of query results (always present).
    * 

@@ -178,36 +163,28 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
   public static final int QUERY_FIELD_NUMBER = 2;
   private com.google.datastore.v1.Query query_;
   /**
-   *
-   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

    *
    * .google.datastore.v1.Query query = 2;
-   *
    * @return Whether the query field is set.
    */
   public boolean hasQuery() {
     return query_ != null;
   }
   /**
-   *
-   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

    *
    * .google.datastore.v1.Query query = 2;
-   *
    * @return The query.
    */
   public com.google.datastore.v1.Query getQuery() {
     return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_;
   }
   /**
-   *
-   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

@@ -219,7 +196,6 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -231,7 +207,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (batch_ != null) {
       output.writeMessage(1, getBatch());
     }
@@ -248,10 +225,12 @@ public int getSerializedSize() {
 
     size = 0;
     if (batch_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getBatch());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, getBatch());
     }
     if (query_ != null) {
-      size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery());
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, getQuery());
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -261,7 +240,7 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.RunQueryResponse)) {
       return super.equals(obj);
@@ -270,11 +249,13 @@ public boolean equals(final java.lang.Object obj) {
 
     if (hasBatch() != other.hasBatch()) return false;
     if (hasBatch()) {
-      if (!getBatch().equals(other.getBatch())) return false;
+      if (!getBatch()
+          .equals(other.getBatch())) return false;
     }
     if (hasQuery() != other.hasQuery()) return false;
     if (hasQuery()) {
-      if (!getQuery().equals(other.getQuery())) return false;
+      if (!getQuery()
+          .equals(other.getQuery())) return false;
     }
     if (!unknownFields.equals(other.unknownFields)) return false;
     return true;
@@ -300,127 +281,118 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.RunQueryResponse parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.RunQueryResponse parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RunQueryResponse parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RunQueryResponse parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.RunQueryResponse parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.RunQueryResponse parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RunQueryResponse parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.RunQueryResponse parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.RunQueryResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery].
    * 

    *
    * Protobuf type {@code google.datastore.v1.RunQueryResponse}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.RunQueryResponse)
       com.google.datastore.v1.RunQueryResponseOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RunQueryResponse_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.RunQueryResponse.class,
-              com.google.datastore.v1.RunQueryResponse.Builder.class);
+              com.google.datastore.v1.RunQueryResponse.class, com.google.datastore.v1.RunQueryResponse.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.RunQueryResponse.newBuilder()
@@ -428,15 +400,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -456,9 +429,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_RunQueryResponse_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor;
     }
 
     @java.lang.Override
@@ -477,8 +450,7 @@ public com.google.datastore.v1.RunQueryResponse build() {
 
     @java.lang.Override
     public com.google.datastore.v1.RunQueryResponse buildPartial() {
-      com.google.datastore.v1.RunQueryResponse result =
-          new com.google.datastore.v1.RunQueryResponse(this);
+      com.google.datastore.v1.RunQueryResponse result = new com.google.datastore.v1.RunQueryResponse(this);
       if (batchBuilder_ == null) {
         result.batch_ = batch_;
       } else {
@@ -497,39 +469,38 @@ public com.google.datastore.v1.RunQueryResponse buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RunQueryResponse) {
-        return mergeFrom((com.google.datastore.v1.RunQueryResponse) other);
+        return mergeFrom((com.google.datastore.v1.RunQueryResponse)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -575,47 +546,34 @@ public Builder mergeFrom(
 
     private com.google.datastore.v1.QueryResultBatch batch_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.QueryResultBatch,
-            com.google.datastore.v1.QueryResultBatch.Builder,
-            com.google.datastore.v1.QueryResultBatchOrBuilder>
-        batchBuilder_;
+        com.google.datastore.v1.QueryResultBatch, com.google.datastore.v1.QueryResultBatch.Builder, com.google.datastore.v1.QueryResultBatchOrBuilder> batchBuilder_;
     /**
-     *
-     *
      * 
      * A batch of query results (always present).
      * 

      *
      * .google.datastore.v1.QueryResultBatch batch = 1;
-     *
      * @return Whether the batch field is set.
      */
     public boolean hasBatch() {
       return batchBuilder_ != null || batch_ != null;
     }
     /**
-     *
-     *
      * 
      * A batch of query results (always present).
      * 

      *
      * .google.datastore.v1.QueryResultBatch batch = 1;
-     *
      * @return The batch.
      */
     public com.google.datastore.v1.QueryResultBatch getBatch() {
       if (batchBuilder_ == null) {
-        return batch_ == null
-            ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance()
-            : batch_;
+        return batch_ == null ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_;
       } else {
         return batchBuilder_.getMessage();
       }
     }
     /**
-     *
-     *
      * 
      * A batch of query results (always present).
      * 

@@ -636,15 +594,14 @@ public Builder setBatch(com.google.datastore.v1.QueryResultBatch value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A batch of query results (always present).
      * 

      *
      * .google.datastore.v1.QueryResultBatch batch = 1;
      */
-    public Builder setBatch(com.google.datastore.v1.QueryResultBatch.Builder builderForValue) {
+    public Builder setBatch(
+        com.google.datastore.v1.QueryResultBatch.Builder builderForValue) {
       if (batchBuilder_ == null) {
         batch_ = builderForValue.build();
         onChanged();
@@ -655,8 +612,6 @@ public Builder setBatch(com.google.datastore.v1.QueryResultBatch.Builder builder
       return this;
     }
     /**
-     *
-     *
      * 
      * A batch of query results (always present).
      * 

@@ -667,9 +622,7 @@ public Builder mergeBatch(com.google.datastore.v1.QueryResultBatch value) {
       if (batchBuilder_ == null) {
         if (batch_ != null) {
           batch_ =
-              com.google.datastore.v1.QueryResultBatch.newBuilder(batch_)
-                  .mergeFrom(value)
-                  .buildPartial();
+            com.google.datastore.v1.QueryResultBatch.newBuilder(batch_).mergeFrom(value).buildPartial();
         } else {
           batch_ = value;
         }
@@ -681,8 +634,6 @@ public Builder mergeBatch(com.google.datastore.v1.QueryResultBatch value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A batch of query results (always present).
      * 

@@ -701,8 +652,6 @@ public Builder clearBatch() {
       return this;
     }
     /**
-     *
-     *
      * 
      * A batch of query results (always present).
      * 

@@ -710,13 +659,11 @@ public Builder clearBatch() {
      * .google.datastore.v1.QueryResultBatch batch = 1;
      */
     public com.google.datastore.v1.QueryResultBatch.Builder getBatchBuilder() {
-
+      
       onChanged();
       return getBatchFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * A batch of query results (always present).
      * 

@@ -727,14 +674,11 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
       if (batchBuilder_ != null) {
         return batchBuilder_.getMessageOrBuilder();
       } else {
-        return batch_ == null
-            ? com.google.datastore.v1.QueryResultBatch.getDefaultInstance()
-            : batch_;
+        return batch_ == null ?
+            com.google.datastore.v1.QueryResultBatch.getDefaultInstance() : batch_;
       }
     }
     /**
-     *
-     *
      * 
      * A batch of query results (always present).
      * 

@@ -742,17 +686,14 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
      * .google.datastore.v1.QueryResultBatch batch = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.QueryResultBatch,
-            com.google.datastore.v1.QueryResultBatch.Builder,
-            com.google.datastore.v1.QueryResultBatchOrBuilder>
+        com.google.datastore.v1.QueryResultBatch, com.google.datastore.v1.QueryResultBatch.Builder, com.google.datastore.v1.QueryResultBatchOrBuilder> 
         getBatchFieldBuilder() {
       if (batchBuilder_ == null) {
-        batchBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.QueryResultBatch,
-                com.google.datastore.v1.QueryResultBatch.Builder,
-                com.google.datastore.v1.QueryResultBatchOrBuilder>(
-                getBatch(), getParentForChildren(), isClean());
+        batchBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.QueryResultBatch, com.google.datastore.v1.QueryResultBatch.Builder, com.google.datastore.v1.QueryResultBatchOrBuilder>(
+                getBatch(),
+                getParentForChildren(),
+                isClean());
         batch_ = null;
       }
       return batchBuilder_;
@@ -760,33 +701,24 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
 
     private com.google.datastore.v1.Query query_;
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Query,
-            com.google.datastore.v1.Query.Builder,
-            com.google.datastore.v1.QueryOrBuilder>
-        queryBuilder_;
+        com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> queryBuilder_;
     /**
-     *
-     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

      *
      * .google.datastore.v1.Query query = 2;
-     *
      * @return Whether the query field is set.
      */
     public boolean hasQuery() {
       return queryBuilder_ != null || query_ != null;
     }
     /**
-     *
-     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

      *
      * .google.datastore.v1.Query query = 2;
-     *
      * @return The query.
      */
     public com.google.datastore.v1.Query getQuery() {
@@ -797,8 +729,6 @@ public com.google.datastore.v1.Query getQuery() {
       }
     }
     /**
-     *
-     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -819,15 +749,14 @@ public Builder setQuery(com.google.datastore.v1.Query value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

      *
      * .google.datastore.v1.Query query = 2;
      */
-    public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
+    public Builder setQuery(
+        com.google.datastore.v1.Query.Builder builderForValue) {
       if (queryBuilder_ == null) {
         query_ = builderForValue.build();
         onChanged();
@@ -838,8 +767,6 @@ public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -849,7 +776,8 @@ public Builder setQuery(com.google.datastore.v1.Query.Builder builderForValue) {
     public Builder mergeQuery(com.google.datastore.v1.Query value) {
       if (queryBuilder_ == null) {
         if (query_ != null) {
-          query_ = com.google.datastore.v1.Query.newBuilder(query_).mergeFrom(value).buildPartial();
+          query_ =
+            com.google.datastore.v1.Query.newBuilder(query_).mergeFrom(value).buildPartial();
         } else {
           query_ = value;
         }
@@ -861,8 +789,6 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -881,8 +807,6 @@ public Builder clearQuery() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -890,13 +814,11 @@ public Builder clearQuery() {
      * .google.datastore.v1.Query query = 2;
      */
     public com.google.datastore.v1.Query.Builder getQueryBuilder() {
-
+      
       onChanged();
       return getQueryFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -907,12 +829,11 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
       if (queryBuilder_ != null) {
         return queryBuilder_.getMessageOrBuilder();
       } else {
-        return query_ == null ? com.google.datastore.v1.Query.getDefaultInstance() : query_;
+        return query_ == null ?
+            com.google.datastore.v1.Query.getDefaultInstance() : query_;
       }
     }
     /**
-     *
-     *
      * 
      * The parsed form of the `GqlQuery` from the request, if it was set.
      * 

@@ -920,24 +841,21 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
      * .google.datastore.v1.Query query = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Query,
-            com.google.datastore.v1.Query.Builder,
-            com.google.datastore.v1.QueryOrBuilder>
+        com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder> 
         getQueryFieldBuilder() {
       if (queryBuilder_ == null) {
-        queryBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Query,
-                com.google.datastore.v1.Query.Builder,
-                com.google.datastore.v1.QueryOrBuilder>(
-                getQuery(), getParentForChildren(), isClean());
+        queryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, com.google.datastore.v1.QueryOrBuilder>(
+                getQuery(),
+                getParentForChildren(),
+                isClean());
         query_ = null;
       }
       return queryBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -947,12 +865,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.RunQueryResponse)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.RunQueryResponse)
   private static final com.google.datastore.v1.RunQueryResponse DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.RunQueryResponse();
   }
@@ -961,16 +879,16 @@ public static com.google.datastore.v1.RunQueryResponse getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public RunQueryResponse parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new RunQueryResponse(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public RunQueryResponse parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new RunQueryResponse(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -985,4 +903,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java
index b36474c3c..4f88f1527 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java
@@ -18,38 +18,29 @@
 
 package com.google.datastore.v1;
 
-public interface RunQueryResponseOrBuilder
-    extends
+public interface RunQueryResponseOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.RunQueryResponse)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * A batch of query results (always present).
    * 

    *
    * .google.datastore.v1.QueryResultBatch batch = 1;
-   *
    * @return Whether the batch field is set.
    */
   boolean hasBatch();
   /**
-   *
-   *
    * 
    * A batch of query results (always present).
    * 

    *
    * .google.datastore.v1.QueryResultBatch batch = 1;
-   *
    * @return The batch.
    */
   com.google.datastore.v1.QueryResultBatch getBatch();
   /**
-   *
-   *
    * 
    * A batch of query results (always present).
    * 

@@ -59,32 +50,24 @@ public interface RunQueryResponseOrBuilder
   com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder();
 
   /**
-   *
-   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

    *
    * .google.datastore.v1.Query query = 2;
-   *
    * @return Whether the query field is set.
    */
   boolean hasQuery();
   /**
-   *
-   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

    *
    * .google.datastore.v1.Query query = 2;
-   *
    * @return The query.
    */
   com.google.datastore.v1.Query getQuery();
   /**
-   *
-   *
    * 
    * The parsed form of the `GqlQuery` from the request, if it was set.
    * 

diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
index 76094d9b7..ca1287ac1 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
@@ -19,8 +19,6 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * Options for beginning a new transaction.
  * Transactions can be created explicitly with calls to
@@ -30,29 +28,30 @@
  *
  * Protobuf type {@code google.datastore.v1.TransactionOptions}
  */
-public final class TransactionOptions extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class TransactionOptions extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions)
     TransactionOptionsOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use TransactionOptions.newBuilder() to construct.
   private TransactionOptions(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private TransactionOptions() {}
+  private TransactionOptions() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new TransactionOptions();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private TransactionOptions(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -71,128 +70,112 @@ private TransactionOptions(
           case 0:
             done = true;
             break;
-          case 10:
-            {
-              com.google.datastore.v1.TransactionOptions.ReadWrite.Builder subBuilder = null;
-              if (modeCase_ == 1) {
-                subBuilder =
-                    ((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_).toBuilder();
-              }
-              mode_ =
-                  input.readMessage(
-                      com.google.datastore.v1.TransactionOptions.ReadWrite.parser(),
-                      extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_);
-                mode_ = subBuilder.buildPartial();
-              }
-              modeCase_ = 1;
-              break;
+          case 10: {
+            com.google.datastore.v1.TransactionOptions.ReadWrite.Builder subBuilder = null;
+            if (modeCase_ == 1) {
+              subBuilder = ((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_).toBuilder();
             }
-          case 18:
-            {
-              com.google.datastore.v1.TransactionOptions.ReadOnly.Builder subBuilder = null;
-              if (modeCase_ == 2) {
-                subBuilder =
-                    ((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_).toBuilder();
-              }
-              mode_ =
-                  input.readMessage(
-                      com.google.datastore.v1.TransactionOptions.ReadOnly.parser(),
-                      extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_);
-                mode_ = subBuilder.buildPartial();
-              }
-              modeCase_ = 2;
-              break;
+            mode_ =
+                input.readMessage(com.google.datastore.v1.TransactionOptions.ReadWrite.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_);
+              mode_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            modeCase_ = 1;
+            break;
+          }
+          case 18: {
+            com.google.datastore.v1.TransactionOptions.ReadOnly.Builder subBuilder = null;
+            if (modeCase_ == 2) {
+              subBuilder = ((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_).toBuilder();
+            }
+            mode_ =
+                input.readMessage(com.google.datastore.v1.TransactionOptions.ReadOnly.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_);
+              mode_ = subBuilder.buildPartial();
+            }
+            modeCase_ = 2;
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_TransactionOptions_descriptor;
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.DatastoreProto
-        .internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable
+    return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
-            com.google.datastore.v1.TransactionOptions.class,
-            com.google.datastore.v1.TransactionOptions.Builder.class);
+            com.google.datastore.v1.TransactionOptions.class, com.google.datastore.v1.TransactionOptions.Builder.class);
   }
 
-  public interface ReadWriteOrBuilder
-      extends
+  public interface ReadWriteOrBuilder extends
       // @@protoc_insertion_point(interface_extends:google.datastore.v1.TransactionOptions.ReadWrite)
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     *
-     *
      * 
      * The transaction identifier of the transaction being retried.
      * 

      *
      * bytes previous_transaction = 1;
-     *
      * @return The previousTransaction.
      */
     com.google.protobuf.ByteString getPreviousTransaction();
   }
   /**
-   *
-   *
    * 
    * Options specific to read / write transactions.
    * 

    *
    * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadWrite}
    */
-  public static final class ReadWrite extends com.google.protobuf.GeneratedMessageV3
-      implements
+  public  static final class ReadWrite extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions.ReadWrite)
       ReadWriteOrBuilder {
-    private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
     // Use ReadWrite.newBuilder() to construct.
     private ReadWrite(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-
     private ReadWrite() {
       previousTransaction_ = com.google.protobuf.ByteString.EMPTY;
     }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
       return new ReadWrite();
     }
 
     @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
       return this.unknownFields;
     }
-
     private ReadWrite(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -211,56 +194,51 @@ private ReadWrite(
             case 0:
               done = true;
               break;
-            case 10:
-              {
-                previousTransaction_ = input.readBytes();
-                break;
-              }
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
+            case 10: {
+
+              previousTransaction_ = input.readBytes();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
               }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.TransactionOptions.ReadWrite.class,
-              com.google.datastore.v1.TransactionOptions.ReadWrite.Builder.class);
+              com.google.datastore.v1.TransactionOptions.ReadWrite.class, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder.class);
     }
 
     public static final int PREVIOUS_TRANSACTION_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString previousTransaction_;
     /**
-     *
-     *
      * 
      * The transaction identifier of the transaction being retried.
      * 

      *
      * bytes previous_transaction = 1;
-     *
      * @return The previousTransaction.
      */
     public com.google.protobuf.ByteString getPreviousTransaction() {
@@ -268,7 +246,6 @@ public com.google.protobuf.ByteString getPreviousTransaction() {
     }
 
     private byte memoizedIsInitialized = -1;
-
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -280,7 +257,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       if (!previousTransaction_.isEmpty()) {
         output.writeBytes(1, previousTransaction_);
       }
@@ -294,7 +272,8 @@ public int getSerializedSize() {
 
       size = 0;
       if (!previousTransaction_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, previousTransaction_);
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(1, previousTransaction_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -304,15 +283,15 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof com.google.datastore.v1.TransactionOptions.ReadWrite)) {
         return super.equals(obj);
       }
-      com.google.datastore.v1.TransactionOptions.ReadWrite other =
-          (com.google.datastore.v1.TransactionOptions.ReadWrite) obj;
+      com.google.datastore.v1.TransactionOptions.ReadWrite other = (com.google.datastore.v1.TransactionOptions.ReadWrite) obj;
 
-      if (!getPreviousTransaction().equals(other.getPreviousTransaction())) return false;
+      if (!getPreviousTransaction()
+          .equals(other.getPreviousTransaction())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -332,94 +311,87 @@ public int hashCode() {
     }
 
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
-
-    public static com.google.datastore.v1.TransactionOptions.ReadWrite parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    public static com.google.datastore.v1.TransactionOptions.ReadWrite parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseDelimitedFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        com.google.datastore.v1.TransactionOptions.ReadWrite prototype) {
+    public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadWrite prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
@@ -429,32 +401,27 @@ protected Builder newBuilderForType(
       return builder;
     }
     /**
-     *
-     *
      * 
      * Options specific to read / write transactions.
      * 

      *
      * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadWrite}
      */
-    public static final class Builder
-        extends com.google.protobuf.GeneratedMessageV3.Builder
-        implements
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:google.datastore.v1.TransactionOptions.ReadWrite)
         com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.datastore.v1.DatastoreProto
-            .internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.google.datastore.v1.DatastoreProto
-            .internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable
+        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.google.datastore.v1.TransactionOptions.ReadWrite.class,
-                com.google.datastore.v1.TransactionOptions.ReadWrite.Builder.class);
+                com.google.datastore.v1.TransactionOptions.ReadWrite.class, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder.class);
       }
 
       // Construct using com.google.datastore.v1.TransactionOptions.ReadWrite.newBuilder()
@@ -462,15 +429,16 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
-
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
       }
-
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -480,9 +448,9 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.datastore.v1.DatastoreProto
-            .internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
       @java.lang.Override
@@ -501,8 +469,7 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite build() {
 
       @java.lang.Override
       public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() {
-        com.google.datastore.v1.TransactionOptions.ReadWrite result =
-            new com.google.datastore.v1.TransactionOptions.ReadWrite(this);
+        com.google.datastore.v1.TransactionOptions.ReadWrite result = new com.google.datastore.v1.TransactionOptions.ReadWrite(this);
         result.previousTransaction_ = previousTransaction_;
         onBuilt();
         return result;
@@ -512,41 +479,38 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() {
       public Builder clone() {
         return super.clone();
       }
-
       @java.lang.Override
       public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
-
       @java.lang.Override
-      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
-
       @java.lang.Override
-      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
-
       @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
-
       @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
-
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.datastore.v1.TransactionOptions.ReadWrite) {
-          return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite) other);
+          return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite)other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -554,8 +518,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       }
 
       public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadWrite other) {
-        if (other == com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance())
-          return this;
+        if (other == com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance()) return this;
         if (other.getPreviousTransaction() != com.google.protobuf.ByteString.EMPTY) {
           setPreviousTransaction(other.getPreviousTransaction());
         }
@@ -578,8 +541,7 @@ public Builder mergeFrom(
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (com.google.datastore.v1.TransactionOptions.ReadWrite) e.getUnfinishedMessage();
+          parsedMessage = (com.google.datastore.v1.TransactionOptions.ReadWrite) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -589,61 +551,50 @@ public Builder mergeFrom(
         return this;
       }
 
-      private com.google.protobuf.ByteString previousTransaction_ =
-          com.google.protobuf.ByteString.EMPTY;
+      private com.google.protobuf.ByteString previousTransaction_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       *
-       *
        * 
        * The transaction identifier of the transaction being retried.
        * 

        *
        * bytes previous_transaction = 1;
-       *
        * @return The previousTransaction.
        */
       public com.google.protobuf.ByteString getPreviousTransaction() {
         return previousTransaction_;
       }
       /**
-       *
-       *
        * 
        * The transaction identifier of the transaction being retried.
        * 

        *
        * bytes previous_transaction = 1;
-       *
        * @param value The previousTransaction to set.
        * @return This builder for chaining.
        */
       public Builder setPreviousTransaction(com.google.protobuf.ByteString value) {
         if (value == null) {
-          throw new NullPointerException();
-        }
-
+    throw new NullPointerException();
+  }
+  
         previousTransaction_ = value;
         onChanged();
         return this;
       }
       /**
-       *
-       *
        * 
        * The transaction identifier of the transaction being retried.
        * 

        *
        * bytes previous_transaction = 1;
-       *
        * @return This builder for chaining.
        */
       public Builder clearPreviousTransaction() {
-
+        
         previousTransaction_ = getDefaultInstance().getPreviousTransaction();
         onChanged();
         return this;
       }
-
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -656,12 +607,12 @@ public final Builder mergeUnknownFields(
         return super.mergeUnknownFields(unknownFields);
       }
 
+
       // @@protoc_insertion_point(builder_scope:google.datastore.v1.TransactionOptions.ReadWrite)
     }
 
     // @@protoc_insertion_point(class_scope:google.datastore.v1.TransactionOptions.ReadWrite)
     private static final com.google.datastore.v1.TransactionOptions.ReadWrite DEFAULT_INSTANCE;
-
     static {
       DEFAULT_INSTANCE = new com.google.datastore.v1.TransactionOptions.ReadWrite();
     }
@@ -670,16 +621,16 @@ public static com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultIns
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser PARSER =
-        new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
-          public ReadWrite parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            return new ReadWrite(input, extensionRegistry);
-          }
-        };
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
+      @java.lang.Override
+      public ReadWrite parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ReadWrite(input, extensionRegistry);
+      }
+    };
 
     public static com.google.protobuf.Parser parser() {
       return PARSER;
@@ -694,44 +645,44 @@ public com.google.protobuf.Parser getParserForType() {
     public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
-  public interface ReadOnlyOrBuilder
-      extends
+  public interface ReadOnlyOrBuilder extends
       // @@protoc_insertion_point(interface_extends:google.datastore.v1.TransactionOptions.ReadOnly)
-      com.google.protobuf.MessageOrBuilder {}
+      com.google.protobuf.MessageOrBuilder {
+  }
   /**
-   *
-   *
    * 
    * Options specific to read-only transactions.
    * 

    *
    * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadOnly}
    */
-  public static final class ReadOnly extends com.google.protobuf.GeneratedMessageV3
-      implements
+  public  static final class ReadOnly extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:google.datastore.v1.TransactionOptions.ReadOnly)
       ReadOnlyOrBuilder {
-    private static final long serialVersionUID = 0L;
+  private static final long serialVersionUID = 0L;
     // Use ReadOnly.newBuilder() to construct.
     private ReadOnly(com.google.protobuf.GeneratedMessageV3.Builder builder) {
       super(builder);
     }
-
-    private ReadOnly() {}
+    private ReadOnly() {
+    }
 
     @java.lang.Override
     @SuppressWarnings({"unused"})
-    protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
       return new ReadOnly();
     }
 
     @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
       return this.unknownFields;
     }
-
     private ReadOnly(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -750,42 +701,39 @@ private ReadOnly(
             case 0:
               done = true;
               break;
-            default:
-              {
-                if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
               }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
-
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.TransactionOptions.ReadOnly.class,
-              com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class);
+              com.google.datastore.v1.TransactionOptions.ReadOnly.class, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class);
     }
 
     private byte memoizedIsInitialized = -1;
-
     @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
@@ -797,7 +745,8 @@ public final boolean isInitialized() {
     }
 
     @java.lang.Override
-    public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
       unknownFields.writeTo(output);
     }
 
@@ -815,13 +764,12 @@ public int getSerializedSize() {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof com.google.datastore.v1.TransactionOptions.ReadOnly)) {
         return super.equals(obj);
       }
-      com.google.datastore.v1.TransactionOptions.ReadOnly other =
-          (com.google.datastore.v1.TransactionOptions.ReadOnly) obj;
+      com.google.datastore.v1.TransactionOptions.ReadOnly other = (com.google.datastore.v1.TransactionOptions.ReadOnly) obj;
 
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -840,94 +788,87 @@ public int hashCode() {
     }
 
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
-        java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
-        java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
-    public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
-
-    public static com.google.datastore.v1.TransactionOptions.ReadOnly parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    public static com.google.datastore.v1.TransactionOptions.ReadOnly parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseDelimitedFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-
     public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-          PARSER, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
-    public static Builder newBuilder(
-        com.google.datastore.v1.TransactionOptions.ReadOnly prototype) {
+    public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadOnly prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-
     @java.lang.Override
     public Builder toBuilder() {
-      return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
@@ -937,32 +878,27 @@ protected Builder newBuilderForType(
       return builder;
     }
     /**
-     *
-     *
      * 
      * Options specific to read-only transactions.
      * 

      *
      * Protobuf type {@code google.datastore.v1.TransactionOptions.ReadOnly}
      */
-    public static final class Builder
-        extends com.google.protobuf.GeneratedMessageV3.Builder
-        implements
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder implements
         // @@protoc_insertion_point(builder_implements:google.datastore.v1.TransactionOptions.ReadOnly)
         com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.datastore.v1.DatastoreProto
-            .internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return com.google.datastore.v1.DatastoreProto
-            .internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable
+        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                com.google.datastore.v1.TransactionOptions.ReadOnly.class,
-                com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class);
+                com.google.datastore.v1.TransactionOptions.ReadOnly.class, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class);
       }
 
       // Construct using com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder()
@@ -970,15 +906,16 @@ private Builder() {
         maybeForceBuilderInitialization();
       }
 
-      private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
-
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
       }
-
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -986,9 +923,9 @@ public Builder clear() {
       }
 
       @java.lang.Override
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.datastore.v1.DatastoreProto
-            .internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
       @java.lang.Override
@@ -1007,8 +944,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly build() {
 
       @java.lang.Override
       public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() {
-        com.google.datastore.v1.TransactionOptions.ReadOnly result =
-            new com.google.datastore.v1.TransactionOptions.ReadOnly(this);
+        com.google.datastore.v1.TransactionOptions.ReadOnly result = new com.google.datastore.v1.TransactionOptions.ReadOnly(this);
         onBuilt();
         return result;
       }
@@ -1017,41 +953,38 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() {
       public Builder clone() {
         return super.clone();
       }
-
       @java.lang.Override
       public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.setField(field, value);
       }
-
       @java.lang.Override
-      public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
-
       @java.lang.Override
-      public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return super.clearOneof(oneof);
       }
-
       @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index,
-          java.lang.Object value) {
+          int index, java.lang.Object value) {
         return super.setRepeatedField(field, index, value);
       }
-
       @java.lang.Override
       public Builder addRepeatedField(
-          com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
-
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.datastore.v1.TransactionOptions.ReadOnly) {
-          return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly) other);
+          return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly)other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -1059,8 +992,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
       }
 
       public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadOnly other) {
-        if (other == com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance())
-          return this;
+        if (other == com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance()) return this;
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1080,8 +1012,7 @@ public Builder mergeFrom(
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage =
-              (com.google.datastore.v1.TransactionOptions.ReadOnly) e.getUnfinishedMessage();
+          parsedMessage = (com.google.datastore.v1.TransactionOptions.ReadOnly) e.getUnfinishedMessage();
           throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
@@ -1090,7 +1021,6 @@ public Builder mergeFrom(
         }
         return this;
       }
-
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1103,12 +1033,12 @@ public final Builder mergeUnknownFields(
         return super.mergeUnknownFields(unknownFields);
       }
 
+
       // @@protoc_insertion_point(builder_scope:google.datastore.v1.TransactionOptions.ReadOnly)
     }
 
     // @@protoc_insertion_point(class_scope:google.datastore.v1.TransactionOptions.ReadOnly)
     private static final com.google.datastore.v1.TransactionOptions.ReadOnly DEFAULT_INSTANCE;
-
     static {
       DEFAULT_INSTANCE = new com.google.datastore.v1.TransactionOptions.ReadOnly();
     }
@@ -1117,16 +1047,16 @@ public static com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInst
       return DEFAULT_INSTANCE;
     }
 
-    private static final com.google.protobuf.Parser PARSER =
-        new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
-          public ReadOnly parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            return new ReadOnly(input, extensionRegistry);
-          }
-        };
+    private static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
+      @java.lang.Override
+      public ReadOnly parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ReadOnly(input, extensionRegistry);
+      }
+    };
 
     public static com.google.protobuf.Parser parser() {
       return PARSER;
@@ -1141,20 +1071,18 @@ public com.google.protobuf.Parser getParserForType() {
     public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
+
   }
 
   private int modeCase_ = 0;
   private java.lang.Object mode_;
-
   public enum ModeCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
+      implements com.google.protobuf.Internal.EnumLite,
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     READ_WRITE(1),
     READ_ONLY(2),
     MODE_NOT_SET(0);
     private final int value;
-
     private ModeCase(int value) {
       this.value = value;
     }
@@ -1170,61 +1098,50 @@ public static ModeCase valueOf(int value) {
 
     public static ModeCase forNumber(int value) {
       switch (value) {
-        case 1:
-          return READ_WRITE;
-        case 2:
-          return READ_ONLY;
-        case 0:
-          return MODE_NOT_SET;
-        default:
-          return null;
+        case 1: return READ_WRITE;
+        case 2: return READ_ONLY;
+        case 0: return MODE_NOT_SET;
+        default: return null;
       }
     }
-
     public int getNumber() {
       return this.value;
     }
   };
 
-  public ModeCase getModeCase() {
-    return ModeCase.forNumber(modeCase_);
+  public ModeCase
+  getModeCase() {
+    return ModeCase.forNumber(
+        modeCase_);
   }
 
   public static final int READ_WRITE_FIELD_NUMBER = 1;
   /**
-   *
-   *
    * 
    * The transaction should allow both reads and writes.
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
-   *
    * @return Whether the readWrite field is set.
    */
   public boolean hasReadWrite() {
     return modeCase_ == 1;
   }
   /**
-   *
-   *
    * 
    * The transaction should allow both reads and writes.
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
-   *
    * @return The readWrite.
    */
   public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
     if (modeCase_ == 1) {
-      return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_;
+       return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_;
     }
     return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * The transaction should allow both reads and writes.
    * 

@@ -1233,46 +1150,38 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
    */
   public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder() {
     if (modeCase_ == 1) {
-      return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_;
+       return (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_;
     }
     return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance();
   }
 
   public static final int READ_ONLY_FIELD_NUMBER = 2;
   /**
-   *
-   *
    * 
    * The transaction should only allow reads.
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
-   *
    * @return Whether the readOnly field is set.
    */
   public boolean hasReadOnly() {
     return modeCase_ == 2;
   }
   /**
-   *
-   *
    * 
    * The transaction should only allow reads.
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
-   *
    * @return The readOnly.
    */
   public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
     if (modeCase_ == 2) {
-      return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_;
+       return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_;
     }
     return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * The transaction should only allow reads.
    * 

@@ -1281,13 +1190,12 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
    */
   public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrBuilder() {
     if (modeCase_ == 2) {
-      return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_;
+       return (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_;
     }
     return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance();
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -1299,7 +1207,8 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (modeCase_ == 1) {
       output.writeMessage(1, (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_);
     }
@@ -1316,14 +1225,12 @@ public int getSerializedSize() {
 
     size = 0;
     if (modeCase_ == 1) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              1, (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(1, (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_);
     }
     if (modeCase_ == 2) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              2, (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(2, (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -1333,21 +1240,22 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.TransactionOptions)) {
       return super.equals(obj);
     }
-    com.google.datastore.v1.TransactionOptions other =
-        (com.google.datastore.v1.TransactionOptions) obj;
+    com.google.datastore.v1.TransactionOptions other = (com.google.datastore.v1.TransactionOptions) obj;
 
     if (!getModeCase().equals(other.getModeCase())) return false;
     switch (modeCase_) {
       case 1:
-        if (!getReadWrite().equals(other.getReadWrite())) return false;
+        if (!getReadWrite()
+            .equals(other.getReadWrite())) return false;
         break;
       case 2:
-        if (!getReadOnly().equals(other.getReadOnly())) return false;
+        if (!getReadOnly()
+            .equals(other.getReadOnly())) return false;
         break;
       case 0:
       default:
@@ -1380,104 +1288,97 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.TransactionOptions parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.TransactionOptions parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.TransactionOptions parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.TransactionOptions parseFrom(
       com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.TransactionOptions parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.TransactionOptions parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.TransactionOptions parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.TransactionOptions parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.TransactionOptions parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.TransactionOptions parseDelimitedFrom(
-      java.io.InputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  public static com.google.datastore.v1.TransactionOptions parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.TransactionOptions parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.TransactionOptions parseFrom(
-      com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.TransactionOptions parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.TransactionOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * Options for beginning a new transaction.
    * Transactions can be created explicitly with calls to
@@ -1487,23 +1388,21 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * Protobuf type {@code google.datastore.v1.TransactionOptions}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.TransactionOptions)
       com.google.datastore.v1.TransactionOptionsOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_TransactionOptions_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              com.google.datastore.v1.TransactionOptions.class,
-              com.google.datastore.v1.TransactionOptions.Builder.class);
+              com.google.datastore.v1.TransactionOptions.class, com.google.datastore.v1.TransactionOptions.Builder.class);
     }
 
     // Construct using com.google.datastore.v1.TransactionOptions.newBuilder()
@@ -1511,15 +1410,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -1529,9 +1429,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.DatastoreProto
-          .internal_static_google_datastore_v1_TransactionOptions_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor;
     }
 
     @java.lang.Override
@@ -1550,8 +1450,7 @@ public com.google.datastore.v1.TransactionOptions build() {
 
     @java.lang.Override
     public com.google.datastore.v1.TransactionOptions buildPartial() {
-      com.google.datastore.v1.TransactionOptions result =
-          new com.google.datastore.v1.TransactionOptions(this);
+      com.google.datastore.v1.TransactionOptions result = new com.google.datastore.v1.TransactionOptions(this);
       if (modeCase_ == 1) {
         if (readWriteBuilder_ == null) {
           result.mode_ = mode_;
@@ -1575,39 +1474,38 @@ public com.google.datastore.v1.TransactionOptions buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.TransactionOptions) {
-        return mergeFrom((com.google.datastore.v1.TransactionOptions) other);
+        return mergeFrom((com.google.datastore.v1.TransactionOptions)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -1617,20 +1515,17 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
     public Builder mergeFrom(com.google.datastore.v1.TransactionOptions other) {
       if (other == com.google.datastore.v1.TransactionOptions.getDefaultInstance()) return this;
       switch (other.getModeCase()) {
-        case READ_WRITE:
-          {
-            mergeReadWrite(other.getReadWrite());
-            break;
-          }
-        case READ_ONLY:
-          {
-            mergeReadOnly(other.getReadOnly());
-            break;
-          }
-        case MODE_NOT_SET:
-          {
-            break;
-          }
+        case READ_WRITE: {
+          mergeReadWrite(other.getReadWrite());
+          break;
+        }
+        case READ_ONLY: {
+          mergeReadOnly(other.getReadOnly());
+          break;
+        }
+        case MODE_NOT_SET: {
+          break;
+        }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -1660,12 +1555,12 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int modeCase_ = 0;
     private java.lang.Object mode_;
-
-    public ModeCase getModeCase() {
-      return ModeCase.forNumber(modeCase_);
+    public ModeCase
+        getModeCase() {
+      return ModeCase.forNumber(
+          modeCase_);
     }
 
     public Builder clearMode() {
@@ -1675,34 +1570,26 @@ public Builder clearMode() {
       return this;
     }
 
+
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.TransactionOptions.ReadWrite,
-            com.google.datastore.v1.TransactionOptions.ReadWrite.Builder,
-            com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder>
-        readWriteBuilder_;
+        com.google.datastore.v1.TransactionOptions.ReadWrite, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder, com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder> readWriteBuilder_;
     /**
-     *
-     *
      * 
      * The transaction should allow both reads and writes.
      * 

      *
      * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
-     *
      * @return Whether the readWrite field is set.
      */
     public boolean hasReadWrite() {
       return modeCase_ == 1;
     }
     /**
-     *
-     *
      * 
      * The transaction should allow both reads and writes.
      * 

      *
      * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
-     *
      * @return The readWrite.
      */
     public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
@@ -1719,8 +1606,6 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite() {
       }
     }
     /**
-     *
-     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1741,8 +1626,6 @@ public Builder setReadWrite(com.google.datastore.v1.TransactionOptions.ReadWrite
       return this;
     }
     /**
-     *
-     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1761,8 +1644,6 @@ public Builder setReadWrite(
       return this;
     }
     /**
-     *
-     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1771,13 +1652,10 @@ public Builder setReadWrite(
      */
     public Builder mergeReadWrite(com.google.datastore.v1.TransactionOptions.ReadWrite value) {
       if (readWriteBuilder_ == null) {
-        if (modeCase_ == 1
-            && mode_ != com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance()) {
-          mode_ =
-              com.google.datastore.v1.TransactionOptions.ReadWrite.newBuilder(
-                      (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (modeCase_ == 1 &&
+            mode_ != com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance()) {
+          mode_ = com.google.datastore.v1.TransactionOptions.ReadWrite.newBuilder((com.google.datastore.v1.TransactionOptions.ReadWrite) mode_)
+              .mergeFrom(value).buildPartial();
         } else {
           mode_ = value;
         }
@@ -1792,8 +1670,6 @@ public Builder mergeReadWrite(com.google.datastore.v1.TransactionOptions.ReadWri
       return this;
     }
     /**
-     *
-     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1817,8 +1693,6 @@ public Builder clearReadWrite() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1829,8 +1703,6 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite.Builder getReadWrite
       return getReadWriteFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1848,8 +1720,6 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
       }
     }
     /**
-     *
-     *
      * 
      * The transaction should allow both reads and writes.
      * 

@@ -1857,58 +1727,43 @@ public com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit
      * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.TransactionOptions.ReadWrite,
-            com.google.datastore.v1.TransactionOptions.ReadWrite.Builder,
-            com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder>
+        com.google.datastore.v1.TransactionOptions.ReadWrite, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder, com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder> 
         getReadWriteFieldBuilder() {
       if (readWriteBuilder_ == null) {
         if (!(modeCase_ == 1)) {
           mode_ = com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance();
         }
-        readWriteBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.TransactionOptions.ReadWrite,
-                com.google.datastore.v1.TransactionOptions.ReadWrite.Builder,
-                com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder>(
+        readWriteBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.TransactionOptions.ReadWrite, com.google.datastore.v1.TransactionOptions.ReadWrite.Builder, com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder>(
                 (com.google.datastore.v1.TransactionOptions.ReadWrite) mode_,
                 getParentForChildren(),
                 isClean());
         mode_ = null;
       }
       modeCase_ = 1;
-      onChanged();
-      ;
+      onChanged();;
       return readWriteBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.TransactionOptions.ReadOnly,
-            com.google.datastore.v1.TransactionOptions.ReadOnly.Builder,
-            com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder>
-        readOnlyBuilder_;
+        com.google.datastore.v1.TransactionOptions.ReadOnly, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder, com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder> readOnlyBuilder_;
     /**
-     *
-     *
      * 
      * The transaction should only allow reads.
      * 

      *
      * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
-     *
      * @return Whether the readOnly field is set.
      */
     public boolean hasReadOnly() {
       return modeCase_ == 2;
     }
     /**
-     *
-     *
      * 
      * The transaction should only allow reads.
      * 

      *
      * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
-     *
      * @return The readOnly.
      */
     public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
@@ -1925,8 +1780,6 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly() {
       }
     }
     /**
-     *
-     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1947,8 +1800,6 @@ public Builder setReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly v
       return this;
     }
     /**
-     *
-     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1967,8 +1818,6 @@ public Builder setReadOnly(
       return this;
     }
     /**
-     *
-     *
      * 
      * The transaction should only allow reads.
      * 

@@ -1977,13 +1826,10 @@ public Builder setReadOnly(
      */
     public Builder mergeReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly value) {
       if (readOnlyBuilder_ == null) {
-        if (modeCase_ == 2
-            && mode_ != com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance()) {
-          mode_ =
-              com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder(
-                      (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (modeCase_ == 2 &&
+            mode_ != com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance()) {
+          mode_ = com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder((com.google.datastore.v1.TransactionOptions.ReadOnly) mode_)
+              .mergeFrom(value).buildPartial();
         } else {
           mode_ = value;
         }
@@ -1998,8 +1844,6 @@ public Builder mergeReadOnly(com.google.datastore.v1.TransactionOptions.ReadOnly
       return this;
     }
     /**
-     *
-     *
      * 
      * The transaction should only allow reads.
      * 

@@ -2023,8 +1867,6 @@ public Builder clearReadOnly() {
       return this;
     }
     /**
-     *
-     *
      * 
      * The transaction should only allow reads.
      * 

@@ -2035,8 +1877,6 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly.Builder getReadOnlyBu
       return getReadOnlyFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * The transaction should only allow reads.
      * 

@@ -2054,8 +1894,6 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO
       }
     }
     /**
-     *
-     *
      * 
      * The transaction should only allow reads.
      * 

@@ -2063,32 +1901,26 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO
      * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.TransactionOptions.ReadOnly,
-            com.google.datastore.v1.TransactionOptions.ReadOnly.Builder,
-            com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder>
+        com.google.datastore.v1.TransactionOptions.ReadOnly, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder, com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder> 
         getReadOnlyFieldBuilder() {
       if (readOnlyBuilder_ == null) {
         if (!(modeCase_ == 2)) {
           mode_ = com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance();
         }
-        readOnlyBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.TransactionOptions.ReadOnly,
-                com.google.datastore.v1.TransactionOptions.ReadOnly.Builder,
-                com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder>(
+        readOnlyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.TransactionOptions.ReadOnly, com.google.datastore.v1.TransactionOptions.ReadOnly.Builder, com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder>(
                 (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_,
                 getParentForChildren(),
                 isClean());
         mode_ = null;
       }
       modeCase_ = 2;
-      onChanged();
-      ;
+      onChanged();;
       return readOnlyBuilder_;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -2098,12 +1930,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.TransactionOptions)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.TransactionOptions)
   private static final com.google.datastore.v1.TransactionOptions DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.TransactionOptions();
   }
@@ -2112,16 +1944,16 @@ public static com.google.datastore.v1.TransactionOptions getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public TransactionOptions parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new TransactionOptions(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public TransactionOptions parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new TransactionOptions(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -2136,4 +1968,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java
index 94f0b1644..d7d46615c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java
@@ -18,38 +18,29 @@
 
 package com.google.datastore.v1;
 
-public interface TransactionOptionsOrBuilder
-    extends
+public interface TransactionOptionsOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.TransactionOptions)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * The transaction should allow both reads and writes.
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
-   *
    * @return Whether the readWrite field is set.
    */
   boolean hasReadWrite();
   /**
-   *
-   *
    * 
    * The transaction should allow both reads and writes.
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadWrite read_write = 1;
-   *
    * @return The readWrite.
    */
   com.google.datastore.v1.TransactionOptions.ReadWrite getReadWrite();
   /**
-   *
-   *
    * 
    * The transaction should allow both reads and writes.
    * 

@@ -59,32 +50,24 @@ public interface TransactionOptionsOrBuilder
   com.google.datastore.v1.TransactionOptions.ReadWriteOrBuilder getReadWriteOrBuilder();
 
   /**
-   *
-   *
    * 
    * The transaction should only allow reads.
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
-   *
    * @return Whether the readOnly field is set.
    */
   boolean hasReadOnly();
   /**
-   *
-   *
    * 
    * The transaction should only allow reads.
    * 

    *
    * .google.datastore.v1.TransactionOptions.ReadOnly read_only = 2;
-   *
    * @return The readOnly.
    */
   com.google.datastore.v1.TransactionOptions.ReadOnly getReadOnly();
   /**
-   *
-   *
    * 
    * The transaction should only allow reads.
    * 

diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
index 69928d03d..7ceeab71f 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
@@ -19,8 +19,6 @@
 package com.google.datastore.v1;
 
 /**
- *
- *
  * 
  * A message that can hold any of the supported value types and associated
  * metadata.
@@ -28,29 +26,30 @@
  *
  * Protobuf type {@code google.datastore.v1.Value}
  */
-public final class Value extends com.google.protobuf.GeneratedMessageV3
-    implements
+public  final class Value extends
+    com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:google.datastore.v1.Value)
     ValueOrBuilder {
-  private static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
   // Use Value.newBuilder() to construct.
   private Value(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     super(builder);
   }
-
-  private Value() {}
+  private Value() {
+  }
 
   @java.lang.Override
   @SuppressWarnings({"unused"})
-  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+  protected java.lang.Object newInstance(
+      UnusedPrivateParameter unused) {
     return new Value();
   }
 
   @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
     return this.unknownFields;
   }
-
   private Value(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -69,166 +68,154 @@ private Value(
           case 0:
             done = true;
             break;
-          case 8:
-            {
-              valueTypeCase_ = 1;
-              valueType_ = input.readBool();
-              break;
-            }
-          case 16:
-            {
-              valueTypeCase_ = 2;
-              valueType_ = input.readInt64();
-              break;
-            }
-          case 25:
-            {
-              valueTypeCase_ = 3;
-              valueType_ = input.readDouble();
-              break;
-            }
-          case 42:
-            {
-              com.google.datastore.v1.Key.Builder subBuilder = null;
-              if (valueTypeCase_ == 5) {
-                subBuilder = ((com.google.datastore.v1.Key) valueType_).toBuilder();
-              }
-              valueType_ =
-                  input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Key) valueType_);
-                valueType_ = subBuilder.buildPartial();
-              }
-              valueTypeCase_ = 5;
-              break;
+          case 8: {
+            valueTypeCase_ = 1;
+            valueType_ = input.readBool();
+            break;
+          }
+          case 16: {
+            valueTypeCase_ = 2;
+            valueType_ = input.readInt64();
+            break;
+          }
+          case 25: {
+            valueTypeCase_ = 3;
+            valueType_ = input.readDouble();
+            break;
+          }
+          case 42: {
+            com.google.datastore.v1.Key.Builder subBuilder = null;
+            if (valueTypeCase_ == 5) {
+              subBuilder = ((com.google.datastore.v1.Key) valueType_).toBuilder();
             }
-          case 50:
-            {
-              com.google.datastore.v1.Entity.Builder subBuilder = null;
-              if (valueTypeCase_ == 6) {
-                subBuilder = ((com.google.datastore.v1.Entity) valueType_).toBuilder();
-              }
-              valueType_ =
-                  input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.Entity) valueType_);
-                valueType_ = subBuilder.buildPartial();
-              }
-              valueTypeCase_ = 6;
-              break;
+            valueType_ =
+                input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.Key) valueType_);
+              valueType_ = subBuilder.buildPartial();
             }
-          case 66:
-            {
-              com.google.type.LatLng.Builder subBuilder = null;
-              if (valueTypeCase_ == 8) {
-                subBuilder = ((com.google.type.LatLng) valueType_).toBuilder();
-              }
-              valueType_ = input.readMessage(com.google.type.LatLng.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.type.LatLng) valueType_);
-                valueType_ = subBuilder.buildPartial();
-              }
-              valueTypeCase_ = 8;
-              break;
+            valueTypeCase_ = 5;
+            break;
+          }
+          case 50: {
+            com.google.datastore.v1.Entity.Builder subBuilder = null;
+            if (valueTypeCase_ == 6) {
+              subBuilder = ((com.google.datastore.v1.Entity) valueType_).toBuilder();
             }
-          case 74:
-            {
-              com.google.datastore.v1.ArrayValue.Builder subBuilder = null;
-              if (valueTypeCase_ == 9) {
-                subBuilder = ((com.google.datastore.v1.ArrayValue) valueType_).toBuilder();
-              }
-              valueType_ =
-                  input.readMessage(com.google.datastore.v1.ArrayValue.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.datastore.v1.ArrayValue) valueType_);
-                valueType_ = subBuilder.buildPartial();
-              }
-              valueTypeCase_ = 9;
-              break;
+            valueType_ =
+                input.readMessage(com.google.datastore.v1.Entity.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.Entity) valueType_);
+              valueType_ = subBuilder.buildPartial();
             }
-          case 82:
-            {
-              com.google.protobuf.Timestamp.Builder subBuilder = null;
-              if (valueTypeCase_ == 10) {
-                subBuilder = ((com.google.protobuf.Timestamp) valueType_).toBuilder();
-              }
-              valueType_ =
-                  input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((com.google.protobuf.Timestamp) valueType_);
-                valueType_ = subBuilder.buildPartial();
-              }
-              valueTypeCase_ = 10;
-              break;
+            valueTypeCase_ = 6;
+            break;
+          }
+          case 66: {
+            com.google.type.LatLng.Builder subBuilder = null;
+            if (valueTypeCase_ == 8) {
+              subBuilder = ((com.google.type.LatLng) valueType_).toBuilder();
             }
-          case 88:
-            {
-              int rawValue = input.readEnum();
-              valueTypeCase_ = 11;
-              valueType_ = rawValue;
-              break;
+            valueType_ =
+                input.readMessage(com.google.type.LatLng.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.type.LatLng) valueType_);
+              valueType_ = subBuilder.buildPartial();
             }
-          case 112:
-            {
-              meaning_ = input.readInt32();
-              break;
+            valueTypeCase_ = 8;
+            break;
+          }
+          case 74: {
+            com.google.datastore.v1.ArrayValue.Builder subBuilder = null;
+            if (valueTypeCase_ == 9) {
+              subBuilder = ((com.google.datastore.v1.ArrayValue) valueType_).toBuilder();
             }
-          case 138:
-            {
-              java.lang.String s = input.readStringRequireUtf8();
-              valueTypeCase_ = 17;
-              valueType_ = s;
-              break;
+            valueType_ =
+                input.readMessage(com.google.datastore.v1.ArrayValue.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.datastore.v1.ArrayValue) valueType_);
+              valueType_ = subBuilder.buildPartial();
             }
-          case 146:
-            {
-              valueTypeCase_ = 18;
-              valueType_ = input.readBytes();
-              break;
+            valueTypeCase_ = 9;
+            break;
+          }
+          case 82: {
+            com.google.protobuf.Timestamp.Builder subBuilder = null;
+            if (valueTypeCase_ == 10) {
+              subBuilder = ((com.google.protobuf.Timestamp) valueType_).toBuilder();
             }
-          case 152:
-            {
-              excludeFromIndexes_ = input.readBool();
-              break;
+            valueType_ =
+                input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom((com.google.protobuf.Timestamp) valueType_);
+              valueType_ = subBuilder.buildPartial();
             }
-          default:
-            {
-              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
+            valueTypeCase_ = 10;
+            break;
+          }
+          case 88: {
+            int rawValue = input.readEnum();
+            valueTypeCase_ = 11;
+            valueType_ = rawValue;
+            break;
+          }
+          case 112: {
+
+            meaning_ = input.readInt32();
+            break;
+          }
+          case 138: {
+            java.lang.String s = input.readStringRequireUtf8();
+            valueTypeCase_ = 17;
+            valueType_ = s;
+            break;
+          }
+          case 146: {
+            valueTypeCase_ = 18;
+            valueType_ = input.readBytes();
+            break;
+          }
+          case 152: {
+
+            excludeFromIndexes_ = input.readBool();
+            break;
+          }
+          default: {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
             }
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
       throw e.setUnfinishedMessage(this);
     } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
     } finally {
       this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
-
-  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return com.google.datastore.v1.EntityProto
-        .internal_static_google_datastore_v1_Value_fieldAccessorTable
+    return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             com.google.datastore.v1.Value.class, com.google.datastore.v1.Value.Builder.class);
   }
 
   private int valueTypeCase_ = 0;
   private java.lang.Object valueType_;
-
   public enum ValueTypeCase
-      implements
-          com.google.protobuf.Internal.EnumLite,
+      implements com.google.protobuf.Internal.EnumLite,
           com.google.protobuf.AbstractMessage.InternalOneOfEnum {
     NULL_VALUE(11),
     BOOLEAN_VALUE(1),
@@ -243,7 +230,6 @@ public enum ValueTypeCase
     ARRAY_VALUE(9),
     VALUETYPE_NOT_SET(0);
     private final int value;
-
     private ValueTypeCase(int value) {
       this.value = value;
     }
@@ -259,54 +245,39 @@ public static ValueTypeCase valueOf(int value) {
 
     public static ValueTypeCase forNumber(int value) {
       switch (value) {
-        case 11:
-          return NULL_VALUE;
-        case 1:
-          return BOOLEAN_VALUE;
-        case 2:
-          return INTEGER_VALUE;
-        case 3:
-          return DOUBLE_VALUE;
-        case 10:
-          return TIMESTAMP_VALUE;
-        case 5:
-          return KEY_VALUE;
-        case 17:
-          return STRING_VALUE;
-        case 18:
-          return BLOB_VALUE;
-        case 8:
-          return GEO_POINT_VALUE;
-        case 6:
-          return ENTITY_VALUE;
-        case 9:
-          return ARRAY_VALUE;
-        case 0:
-          return VALUETYPE_NOT_SET;
-        default:
-          return null;
+        case 11: return NULL_VALUE;
+        case 1: return BOOLEAN_VALUE;
+        case 2: return INTEGER_VALUE;
+        case 3: return DOUBLE_VALUE;
+        case 10: return TIMESTAMP_VALUE;
+        case 5: return KEY_VALUE;
+        case 17: return STRING_VALUE;
+        case 18: return BLOB_VALUE;
+        case 8: return GEO_POINT_VALUE;
+        case 6: return ENTITY_VALUE;
+        case 9: return ARRAY_VALUE;
+        case 0: return VALUETYPE_NOT_SET;
+        default: return null;
       }
     }
-
     public int getNumber() {
       return this.value;
     }
   };
 
-  public ValueTypeCase getValueTypeCase() {
-    return ValueTypeCase.forNumber(valueTypeCase_);
+  public ValueTypeCase
+  getValueTypeCase() {
+    return ValueTypeCase.forNumber(
+        valueTypeCase_);
   }
 
   public static final int NULL_VALUE_FIELD_NUMBER = 11;
   /**
-   *
-   *
    * 
    * A null value.
    * 

    *
    * .google.protobuf.NullValue null_value = 11;
-   *
    * @return The enum numeric value on the wire for nullValue.
    */
   public int getNullValueValue() {
@@ -316,21 +287,18 @@ public int getNullValueValue() {
     return 0;
   }
   /**
-   *
-   *
    * 
    * A null value.
    * 

    *
    * .google.protobuf.NullValue null_value = 11;
-   *
    * @return The nullValue.
    */
   public com.google.protobuf.NullValue getNullValue() {
     if (valueTypeCase_ == 11) {
       @SuppressWarnings("deprecation")
-      com.google.protobuf.NullValue result =
-          com.google.protobuf.NullValue.valueOf((java.lang.Integer) valueType_);
+      com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf(
+          (java.lang.Integer) valueType_);
       return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result;
     }
     return com.google.protobuf.NullValue.NULL_VALUE;
@@ -338,14 +306,11 @@ public com.google.protobuf.NullValue getNullValue() {
 
   public static final int BOOLEAN_VALUE_FIELD_NUMBER = 1;
   /**
-   *
-   *
    * 
    * A boolean value.
    * 

    *
    * bool boolean_value = 1;
-   *
    * @return The booleanValue.
    */
   public boolean getBooleanValue() {
@@ -357,14 +322,11 @@ public boolean getBooleanValue() {
 
   public static final int INTEGER_VALUE_FIELD_NUMBER = 2;
   /**
-   *
-   *
    * 
    * An integer value.
    * 

    *
    * int64 integer_value = 2;
-   *
    * @return The integerValue.
    */
   public long getIntegerValue() {
@@ -376,14 +338,11 @@ public long getIntegerValue() {
 
   public static final int DOUBLE_VALUE_FIELD_NUMBER = 3;
   /**
-   *
-   *
    * 
    * A double value.
    * 

    *
    * double double_value = 3;
-   *
    * @return The doubleValue.
    */
   public double getDoubleValue() {
@@ -395,8 +354,6 @@ public double getDoubleValue() {
 
   public static final int TIMESTAMP_VALUE_FIELD_NUMBER = 10;
   /**
-   *
-   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -404,15 +361,12 @@ public double getDoubleValue() {
    * 

    *
    * .google.protobuf.Timestamp timestamp_value = 10;
-   *
    * @return Whether the timestampValue field is set.
    */
   public boolean hasTimestampValue() {
     return valueTypeCase_ == 10;
   }
   /**
-   *
-   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -420,18 +374,15 @@ public boolean hasTimestampValue() {
    * 

    *
    * .google.protobuf.Timestamp timestamp_value = 10;
-   *
    * @return The timestampValue.
    */
   public com.google.protobuf.Timestamp getTimestampValue() {
     if (valueTypeCase_ == 10) {
-      return (com.google.protobuf.Timestamp) valueType_;
+       return (com.google.protobuf.Timestamp) valueType_;
     }
     return com.google.protobuf.Timestamp.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -442,46 +393,38 @@ public com.google.protobuf.Timestamp getTimestampValue() {
    */
   public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
     if (valueTypeCase_ == 10) {
-      return (com.google.protobuf.Timestamp) valueType_;
+       return (com.google.protobuf.Timestamp) valueType_;
     }
     return com.google.protobuf.Timestamp.getDefaultInstance();
   }
 
   public static final int KEY_VALUE_FIELD_NUMBER = 5;
   /**
-   *
-   *
    * 
    * A key value.
    * 

    *
    * .google.datastore.v1.Key key_value = 5;
-   *
    * @return Whether the keyValue field is set.
    */
   public boolean hasKeyValue() {
     return valueTypeCase_ == 5;
   }
   /**
-   *
-   *
    * 
    * A key value.
    * 

    *
    * .google.datastore.v1.Key key_value = 5;
-   *
    * @return The keyValue.
    */
   public com.google.datastore.v1.Key getKeyValue() {
     if (valueTypeCase_ == 5) {
-      return (com.google.datastore.v1.Key) valueType_;
+       return (com.google.datastore.v1.Key) valueType_;
     }
     return com.google.datastore.v1.Key.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * A key value.
    * 

@@ -490,15 +433,13 @@ public com.google.datastore.v1.Key getKeyValue() {
    */
   public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
     if (valueTypeCase_ == 5) {
-      return (com.google.datastore.v1.Key) valueType_;
+       return (com.google.datastore.v1.Key) valueType_;
     }
     return com.google.datastore.v1.Key.getDefaultInstance();
   }
 
   public static final int STRING_VALUE_FIELD_NUMBER = 17;
   /**
-   *
-   *
    * 
    * A UTF-8 encoded string value.
    * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -506,7 +447,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
    * 

    *
    * string string_value = 17;
-   *
    * @return The stringValue.
    */
   public java.lang.String getStringValue() {
@@ -517,7 +457,8 @@ public java.lang.String getStringValue() {
     if (ref instanceof java.lang.String) {
       return (java.lang.String) ref;
     } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
       java.lang.String s = bs.toStringUtf8();
       if (valueTypeCase_ == 17) {
         valueType_ = s;
@@ -526,8 +467,6 @@ public java.lang.String getStringValue() {
     }
   }
   /**
-   *
-   *
    * 
    * A UTF-8 encoded string value.
    * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -535,17 +474,18 @@ public java.lang.String getStringValue() {
    * 

    *
    * string string_value = 17;
-   *
    * @return The bytes for stringValue.
    */
-  public com.google.protobuf.ByteString getStringValueBytes() {
+  public com.google.protobuf.ByteString
+      getStringValueBytes() {
     java.lang.Object ref = "";
     if (valueTypeCase_ == 17) {
       ref = valueType_;
     }
     if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
       if (valueTypeCase_ == 17) {
         valueType_ = b;
       }
@@ -557,8 +497,6 @@ public com.google.protobuf.ByteString getStringValueBytes() {
 
   public static final int BLOB_VALUE_FIELD_NUMBER = 18;
   /**
-   *
-   *
    * 
    * A blob value.
    * May have at most 1,000,000 bytes.
@@ -567,7 +505,6 @@ public com.google.protobuf.ByteString getStringValueBytes() {
    * 

    *
    * bytes blob_value = 18;
-   *
    * @return The blobValue.
    */
   public com.google.protobuf.ByteString getBlobValue() {
@@ -579,39 +516,31 @@ public com.google.protobuf.ByteString getBlobValue() {
 
   public static final int GEO_POINT_VALUE_FIELD_NUMBER = 8;
   /**
-   *
-   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

    *
    * .google.type.LatLng geo_point_value = 8;
-   *
    * @return Whether the geoPointValue field is set.
    */
   public boolean hasGeoPointValue() {
     return valueTypeCase_ == 8;
   }
   /**
-   *
-   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

    *
    * .google.type.LatLng geo_point_value = 8;
-   *
    * @return The geoPointValue.
    */
   public com.google.type.LatLng getGeoPointValue() {
     if (valueTypeCase_ == 8) {
-      return (com.google.type.LatLng) valueType_;
+       return (com.google.type.LatLng) valueType_;
     }
     return com.google.type.LatLng.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

@@ -620,15 +549,13 @@ public com.google.type.LatLng getGeoPointValue() {
    */
   public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
     if (valueTypeCase_ == 8) {
-      return (com.google.type.LatLng) valueType_;
+       return (com.google.type.LatLng) valueType_;
     }
     return com.google.type.LatLng.getDefaultInstance();
   }
 
   public static final int ENTITY_VALUE_FIELD_NUMBER = 6;
   /**
-   *
-   *
    * 
    * An entity value.
    * - May have no key.
@@ -637,15 +564,12 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
    * 

    *
    * .google.datastore.v1.Entity entity_value = 6;
-   *
    * @return Whether the entityValue field is set.
    */
   public boolean hasEntityValue() {
     return valueTypeCase_ == 6;
   }
   /**
-   *
-   *
    * 
    * An entity value.
    * - May have no key.
@@ -654,18 +578,15 @@ public boolean hasEntityValue() {
    * 

    *
    * .google.datastore.v1.Entity entity_value = 6;
-   *
    * @return The entityValue.
    */
   public com.google.datastore.v1.Entity getEntityValue() {
     if (valueTypeCase_ == 6) {
-      return (com.google.datastore.v1.Entity) valueType_;
+       return (com.google.datastore.v1.Entity) valueType_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * An entity value.
    * - May have no key.
@@ -677,15 +598,13 @@ public com.google.datastore.v1.Entity getEntityValue() {
    */
   public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
     if (valueTypeCase_ == 6) {
-      return (com.google.datastore.v1.Entity) valueType_;
+       return (com.google.datastore.v1.Entity) valueType_;
     }
     return com.google.datastore.v1.Entity.getDefaultInstance();
   }
 
   public static final int ARRAY_VALUE_FIELD_NUMBER = 9;
   /**
-   *
-   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -694,15 +613,12 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
    * 

    *
    * .google.datastore.v1.ArrayValue array_value = 9;
-   *
    * @return Whether the arrayValue field is set.
    */
   public boolean hasArrayValue() {
     return valueTypeCase_ == 9;
   }
   /**
-   *
-   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -711,18 +627,15 @@ public boolean hasArrayValue() {
    * 

    *
    * .google.datastore.v1.ArrayValue array_value = 9;
-   *
    * @return The arrayValue.
    */
   public com.google.datastore.v1.ArrayValue getArrayValue() {
     if (valueTypeCase_ == 9) {
-      return (com.google.datastore.v1.ArrayValue) valueType_;
+       return (com.google.datastore.v1.ArrayValue) valueType_;
     }
     return com.google.datastore.v1.ArrayValue.getDefaultInstance();
   }
   /**
-   *
-   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -734,7 +647,7 @@ public com.google.datastore.v1.ArrayValue getArrayValue() {
    */
   public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
     if (valueTypeCase_ == 9) {
-      return (com.google.datastore.v1.ArrayValue) valueType_;
+       return (com.google.datastore.v1.ArrayValue) valueType_;
     }
     return com.google.datastore.v1.ArrayValue.getDefaultInstance();
   }
@@ -742,14 +655,11 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
   public static final int MEANING_FIELD_NUMBER = 14;
   private int meaning_;
   /**
-   *
-   *
    * 
    * The `meaning` field should only be populated for backwards compatibility.
    * 

    *
    * int32 meaning = 14;
-   *
    * @return The meaning.
    */
   public int getMeaning() {
@@ -759,15 +669,12 @@ public int getMeaning() {
   public static final int EXCLUDE_FROM_INDEXES_FIELD_NUMBER = 19;
   private boolean excludeFromIndexes_;
   /**
-   *
-   *
    * 
    * If the value should be excluded from all indexes including those defined
    * explicitly.
    * 

    *
    * bool exclude_from_indexes = 19;
-   *
    * @return The excludeFromIndexes.
    */
   public boolean getExcludeFromIndexes() {
@@ -775,7 +682,6 @@ public boolean getExcludeFromIndexes() {
   }
 
   private byte memoizedIsInitialized = -1;
-
   @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -787,15 +693,19 @@ public final boolean isInitialized() {
   }
 
   @java.lang.Override
-  public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
     if (valueTypeCase_ == 1) {
-      output.writeBool(1, (boolean) ((java.lang.Boolean) valueType_));
+      output.writeBool(
+          1, (boolean)((java.lang.Boolean) valueType_));
     }
     if (valueTypeCase_ == 2) {
-      output.writeInt64(2, (long) ((java.lang.Long) valueType_));
+      output.writeInt64(
+          2, (long)((java.lang.Long) valueType_));
     }
     if (valueTypeCase_ == 3) {
-      output.writeDouble(3, (double) ((java.lang.Double) valueType_));
+      output.writeDouble(
+          3, (double)((java.lang.Double) valueType_));
     }
     if (valueTypeCase_ == 5) {
       output.writeMessage(5, (com.google.datastore.v1.Key) valueType_);
@@ -822,7 +732,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       com.google.protobuf.GeneratedMessageV3.writeString(output, 17, valueType_);
     }
     if (valueTypeCase_ == 18) {
-      output.writeBytes(18, (com.google.protobuf.ByteString) valueType_);
+      output.writeBytes(
+          18, (com.google.protobuf.ByteString) valueType_);
     }
     if (excludeFromIndexes_ != false) {
       output.writeBool(19, excludeFromIndexes_);
@@ -837,63 +748,59 @@ public int getSerializedSize() {
 
     size = 0;
     if (valueTypeCase_ == 1) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeBoolSize(
-              1, (boolean) ((java.lang.Boolean) valueType_));
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(
+            1, (boolean)((java.lang.Boolean) valueType_));
     }
     if (valueTypeCase_ == 2) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeInt64Size(
-              2, (long) ((java.lang.Long) valueType_));
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt64Size(
+            2, (long)((java.lang.Long) valueType_));
     }
     if (valueTypeCase_ == 3) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeDoubleSize(
-              3, (double) ((java.lang.Double) valueType_));
+      size += com.google.protobuf.CodedOutputStream
+        .computeDoubleSize(
+            3, (double)((java.lang.Double) valueType_));
     }
     if (valueTypeCase_ == 5) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              5, (com.google.datastore.v1.Key) valueType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(5, (com.google.datastore.v1.Key) valueType_);
     }
     if (valueTypeCase_ == 6) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              6, (com.google.datastore.v1.Entity) valueType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(6, (com.google.datastore.v1.Entity) valueType_);
     }
     if (valueTypeCase_ == 8) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              8, (com.google.type.LatLng) valueType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(8, (com.google.type.LatLng) valueType_);
     }
     if (valueTypeCase_ == 9) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              9, (com.google.datastore.v1.ArrayValue) valueType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(9, (com.google.datastore.v1.ArrayValue) valueType_);
     }
     if (valueTypeCase_ == 10) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeMessageSize(
-              10, (com.google.protobuf.Timestamp) valueType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(10, (com.google.protobuf.Timestamp) valueType_);
     }
     if (valueTypeCase_ == 11) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeEnumSize(
-              11, ((java.lang.Integer) valueType_));
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(11, ((java.lang.Integer) valueType_));
     }
     if (meaning_ != 0) {
-      size += com.google.protobuf.CodedOutputStream.computeInt32Size(14, meaning_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(14, meaning_);
     }
     if (valueTypeCase_ == 17) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, valueType_);
     }
     if (valueTypeCase_ == 18) {
-      size +=
-          com.google.protobuf.CodedOutputStream.computeBytesSize(
-              18, (com.google.protobuf.ByteString) valueType_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(
+            18, (com.google.protobuf.ByteString) valueType_);
     }
     if (excludeFromIndexes_ != false) {
-      size += com.google.protobuf.CodedOutputStream.computeBoolSize(19, excludeFromIndexes_);
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(19, excludeFromIndexes_);
     }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
@@ -903,50 +810,63 @@ public int getSerializedSize() {
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
-      return true;
+     return true;
     }
     if (!(obj instanceof com.google.datastore.v1.Value)) {
       return super.equals(obj);
     }
     com.google.datastore.v1.Value other = (com.google.datastore.v1.Value) obj;
 
-    if (getMeaning() != other.getMeaning()) return false;
-    if (getExcludeFromIndexes() != other.getExcludeFromIndexes()) return false;
+    if (getMeaning()
+        != other.getMeaning()) return false;
+    if (getExcludeFromIndexes()
+        != other.getExcludeFromIndexes()) return false;
     if (!getValueTypeCase().equals(other.getValueTypeCase())) return false;
     switch (valueTypeCase_) {
       case 11:
-        if (getNullValueValue() != other.getNullValueValue()) return false;
+        if (getNullValueValue()
+            != other.getNullValueValue()) return false;
         break;
       case 1:
-        if (getBooleanValue() != other.getBooleanValue()) return false;
+        if (getBooleanValue()
+            != other.getBooleanValue()) return false;
         break;
       case 2:
-        if (getIntegerValue() != other.getIntegerValue()) return false;
+        if (getIntegerValue()
+            != other.getIntegerValue()) return false;
         break;
       case 3:
         if (java.lang.Double.doubleToLongBits(getDoubleValue())
-            != java.lang.Double.doubleToLongBits(other.getDoubleValue())) return false;
+            != java.lang.Double.doubleToLongBits(
+                other.getDoubleValue())) return false;
         break;
       case 10:
-        if (!getTimestampValue().equals(other.getTimestampValue())) return false;
+        if (!getTimestampValue()
+            .equals(other.getTimestampValue())) return false;
         break;
       case 5:
-        if (!getKeyValue().equals(other.getKeyValue())) return false;
+        if (!getKeyValue()
+            .equals(other.getKeyValue())) return false;
         break;
       case 17:
-        if (!getStringValue().equals(other.getStringValue())) return false;
+        if (!getStringValue()
+            .equals(other.getStringValue())) return false;
         break;
       case 18:
-        if (!getBlobValue().equals(other.getBlobValue())) return false;
+        if (!getBlobValue()
+            .equals(other.getBlobValue())) return false;
         break;
       case 8:
-        if (!getGeoPointValue().equals(other.getGeoPointValue())) return false;
+        if (!getGeoPointValue()
+            .equals(other.getGeoPointValue())) return false;
         break;
       case 6:
-        if (!getEntityValue().equals(other.getEntityValue())) return false;
+        if (!getEntityValue()
+            .equals(other.getEntityValue())) return false;
         break;
       case 9:
-        if (!getArrayValue().equals(other.getArrayValue())) return false;
+        if (!getArrayValue()
+            .equals(other.getArrayValue())) return false;
         break;
       case 0:
       default:
@@ -965,7 +885,8 @@ public int hashCode() {
     hash = (37 * hash) + MEANING_FIELD_NUMBER;
     hash = (53 * hash) + getMeaning();
     hash = (37 * hash) + EXCLUDE_FROM_INDEXES_FIELD_NUMBER;
-    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getExcludeFromIndexes());
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getExcludeFromIndexes());
     switch (valueTypeCase_) {
       case 11:
         hash = (37 * hash) + NULL_VALUE_FIELD_NUMBER;
@@ -973,18 +894,18 @@ public int hashCode() {
         break;
       case 1:
         hash = (37 * hash) + BOOLEAN_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getBooleanValue());
+        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+            getBooleanValue());
         break;
       case 2:
         hash = (37 * hash) + INTEGER_VALUE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getIntegerValue());
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getIntegerValue());
         break;
       case 3:
         hash = (37 * hash) + DOUBLE_VALUE_FIELD_NUMBER;
-        hash =
-            (53 * hash)
-                + com.google.protobuf.Internal.hashLong(
-                    java.lang.Double.doubleToLongBits(getDoubleValue()));
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            java.lang.Double.doubleToLongBits(getDoubleValue()));
         break;
       case 10:
         hash = (37 * hash) + TIMESTAMP_VALUE_FIELD_NUMBER;
@@ -1022,103 +943,97 @@ public int hashCode() {
     return hash;
   }
 
-  public static com.google.datastore.v1.Value parseFrom(java.nio.ByteBuffer data)
+  public static com.google.datastore.v1.Value parseFrom(
+      java.nio.ByteBuffer data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Value parseFrom(
-      java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Value parseFrom(com.google.protobuf.ByteString data)
+  public static com.google.datastore.v1.Value parseFrom(
+      com.google.protobuf.ByteString data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Value parseFrom(
       com.google.protobuf.ByteString data,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Value parseFrom(byte[] data)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data);
   }
-
   public static com.google.datastore.v1.Value parseFrom(
-      byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     return PARSER.parseFrom(data, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Value parseFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Value parseFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
-
   public static com.google.datastore.v1.Value parseDelimitedFrom(java.io.InputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Value parseDelimitedFrom(
-      java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
   }
-
-  public static com.google.datastore.v1.Value parseFrom(com.google.protobuf.CodedInputStream input)
+  public static com.google.datastore.v1.Value parseFrom(
+      com.google.protobuf.CodedInputStream input)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
   }
-
   public static com.google.datastore.v1.Value parseFrom(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
-        PARSER, input, extensionRegistry);
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
   @java.lang.Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
+  public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
   }
-
   public static Builder newBuilder(com.google.datastore.v1.Value prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-
   @java.lang.Override
   public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
   }
 
   @java.lang.Override
-  protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
     Builder builder = new Builder(parent);
     return builder;
   }
   /**
-   *
-   *
    * 
    * A message that can hold any of the supported value types and associated
    * metadata.
@@ -1126,20 +1041,19 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    * Protobuf type {@code google.datastore.v1.Value}
    */
-  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
-      implements
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder implements
       // @@protoc_insertion_point(builder_implements:google.datastore.v1.Value)
       com.google.datastore.v1.ValueOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_Value_descriptor;
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_Value_fieldAccessorTable
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               com.google.datastore.v1.Value.class, com.google.datastore.v1.Value.Builder.class);
     }
@@ -1149,15 +1063,16 @@ private Builder() {
       maybeForceBuilderInitialization();
     }
 
-    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       super(parent);
       maybeForceBuilderInitialization();
     }
-
     private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
     }
-
     @java.lang.Override
     public Builder clear() {
       super.clear();
@@ -1171,9 +1086,9 @@ public Builder clear() {
     }
 
     @java.lang.Override
-    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return com.google.datastore.v1.EntityProto
-          .internal_static_google_datastore_v1_Value_descriptor;
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor;
     }
 
     @java.lang.Override
@@ -1257,39 +1172,38 @@ public com.google.datastore.v1.Value buildPartial() {
     public Builder clone() {
       return super.clone();
     }
-
     @java.lang.Override
     public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.setField(field, value);
     }
-
     @java.lang.Override
-    public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
       return super.clearField(field);
     }
-
     @java.lang.Override
-    public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return super.clearOneof(oneof);
     }
-
     @java.lang.Override
     public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
       return super.setRepeatedField(field, index, value);
     }
-
     @java.lang.Override
     public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
       return super.addRepeatedField(field, value);
     }
-
     @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Value) {
-        return mergeFrom((com.google.datastore.v1.Value) other);
+        return mergeFrom((com.google.datastore.v1.Value)other);
       } else {
         super.mergeFrom(other);
         return this;
@@ -1305,67 +1219,55 @@ public Builder mergeFrom(com.google.datastore.v1.Value other) {
         setExcludeFromIndexes(other.getExcludeFromIndexes());
       }
       switch (other.getValueTypeCase()) {
-        case NULL_VALUE:
-          {
-            setNullValueValue(other.getNullValueValue());
-            break;
-          }
-        case BOOLEAN_VALUE:
-          {
-            setBooleanValue(other.getBooleanValue());
-            break;
-          }
-        case INTEGER_VALUE:
-          {
-            setIntegerValue(other.getIntegerValue());
-            break;
-          }
-        case DOUBLE_VALUE:
-          {
-            setDoubleValue(other.getDoubleValue());
-            break;
-          }
-        case TIMESTAMP_VALUE:
-          {
-            mergeTimestampValue(other.getTimestampValue());
-            break;
-          }
-        case KEY_VALUE:
-          {
-            mergeKeyValue(other.getKeyValue());
-            break;
-          }
-        case STRING_VALUE:
-          {
-            valueTypeCase_ = 17;
-            valueType_ = other.valueType_;
-            onChanged();
-            break;
-          }
-        case BLOB_VALUE:
-          {
-            setBlobValue(other.getBlobValue());
-            break;
-          }
-        case GEO_POINT_VALUE:
-          {
-            mergeGeoPointValue(other.getGeoPointValue());
-            break;
-          }
-        case ENTITY_VALUE:
-          {
-            mergeEntityValue(other.getEntityValue());
-            break;
-          }
-        case ARRAY_VALUE:
-          {
-            mergeArrayValue(other.getArrayValue());
-            break;
-          }
-        case VALUETYPE_NOT_SET:
-          {
-            break;
-          }
+        case NULL_VALUE: {
+          setNullValueValue(other.getNullValueValue());
+          break;
+        }
+        case BOOLEAN_VALUE: {
+          setBooleanValue(other.getBooleanValue());
+          break;
+        }
+        case INTEGER_VALUE: {
+          setIntegerValue(other.getIntegerValue());
+          break;
+        }
+        case DOUBLE_VALUE: {
+          setDoubleValue(other.getDoubleValue());
+          break;
+        }
+        case TIMESTAMP_VALUE: {
+          mergeTimestampValue(other.getTimestampValue());
+          break;
+        }
+        case KEY_VALUE: {
+          mergeKeyValue(other.getKeyValue());
+          break;
+        }
+        case STRING_VALUE: {
+          valueTypeCase_ = 17;
+          valueType_ = other.valueType_;
+          onChanged();
+          break;
+        }
+        case BLOB_VALUE: {
+          setBlobValue(other.getBlobValue());
+          break;
+        }
+        case GEO_POINT_VALUE: {
+          mergeGeoPointValue(other.getGeoPointValue());
+          break;
+        }
+        case ENTITY_VALUE: {
+          mergeEntityValue(other.getEntityValue());
+          break;
+        }
+        case ARRAY_VALUE: {
+          mergeArrayValue(other.getArrayValue());
+          break;
+        }
+        case VALUETYPE_NOT_SET: {
+          break;
+        }
       }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
@@ -1395,12 +1297,12 @@ public Builder mergeFrom(
       }
       return this;
     }
-
     private int valueTypeCase_ = 0;
     private java.lang.Object valueType_;
-
-    public ValueTypeCase getValueTypeCase() {
-      return ValueTypeCase.forNumber(valueTypeCase_);
+    public ValueTypeCase
+        getValueTypeCase() {
+      return ValueTypeCase.forNumber(
+          valueTypeCase_);
     }
 
     public Builder clearValueType() {
@@ -1410,15 +1312,13 @@ public Builder clearValueType() {
       return this;
     }
 
+
     /**
-     *
-     *
      * 
      * A null value.
      * 

      *
      * .google.protobuf.NullValue null_value = 11;
-     *
      * @return The enum numeric value on the wire for nullValue.
      */
     public int getNullValueValue() {
@@ -1428,14 +1328,11 @@ public int getNullValueValue() {
       return 0;
     }
     /**
-     *
-     *
      * 
      * A null value.
      * 

      *
      * .google.protobuf.NullValue null_value = 11;
-     *
      * @param value The enum numeric value on the wire for nullValue to set.
      * @return This builder for chaining.
      */
@@ -1446,34 +1343,28 @@ public Builder setNullValueValue(int value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A null value.
      * 

      *
      * .google.protobuf.NullValue null_value = 11;
-     *
      * @return The nullValue.
      */
     public com.google.protobuf.NullValue getNullValue() {
       if (valueTypeCase_ == 11) {
         @SuppressWarnings("deprecation")
-        com.google.protobuf.NullValue result =
-            com.google.protobuf.NullValue.valueOf((java.lang.Integer) valueType_);
+        com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf(
+            (java.lang.Integer) valueType_);
         return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result;
       }
       return com.google.protobuf.NullValue.NULL_VALUE;
     }
     /**
-     *
-     *
      * 
      * A null value.
      * 

      *
      * .google.protobuf.NullValue null_value = 11;
-     *
      * @param value The nullValue to set.
      * @return This builder for chaining.
      */
@@ -1487,14 +1378,11 @@ public Builder setNullValue(com.google.protobuf.NullValue value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A null value.
      * 

      *
      * .google.protobuf.NullValue null_value = 11;
-     *
      * @return This builder for chaining.
      */
     public Builder clearNullValue() {
@@ -1507,14 +1395,11 @@ public Builder clearNullValue() {
     }
 
     /**
-     *
-     *
      * 
      * A boolean value.
      * 

      *
      * bool boolean_value = 1;
-     *
      * @return The booleanValue.
      */
     public boolean getBooleanValue() {
@@ -1524,14 +1409,11 @@ public boolean getBooleanValue() {
       return false;
     }
     /**
-     *
-     *
      * 
      * A boolean value.
      * 

      *
      * bool boolean_value = 1;
-     *
      * @param value The booleanValue to set.
      * @return This builder for chaining.
      */
@@ -1542,14 +1424,11 @@ public Builder setBooleanValue(boolean value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A boolean value.
      * 

      *
      * bool boolean_value = 1;
-     *
      * @return This builder for chaining.
      */
     public Builder clearBooleanValue() {
@@ -1562,14 +1441,11 @@ public Builder clearBooleanValue() {
     }
 
     /**
-     *
-     *
      * 
      * An integer value.
      * 

      *
      * int64 integer_value = 2;
-     *
      * @return The integerValue.
      */
     public long getIntegerValue() {
@@ -1579,14 +1455,11 @@ public long getIntegerValue() {
       return 0L;
     }
     /**
-     *
-     *
      * 
      * An integer value.
      * 

      *
      * int64 integer_value = 2;
-     *
      * @param value The integerValue to set.
      * @return This builder for chaining.
      */
@@ -1597,14 +1470,11 @@ public Builder setIntegerValue(long value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * An integer value.
      * 

      *
      * int64 integer_value = 2;
-     *
      * @return This builder for chaining.
      */
     public Builder clearIntegerValue() {
@@ -1617,14 +1487,11 @@ public Builder clearIntegerValue() {
     }
 
     /**
-     *
-     *
      * 
      * A double value.
      * 

      *
      * double double_value = 3;
-     *
      * @return The doubleValue.
      */
     public double getDoubleValue() {
@@ -1634,14 +1501,11 @@ public double getDoubleValue() {
       return 0D;
     }
     /**
-     *
-     *
      * 
      * A double value.
      * 

      *
      * double double_value = 3;
-     *
      * @param value The doubleValue to set.
      * @return This builder for chaining.
      */
@@ -1652,14 +1516,11 @@ public Builder setDoubleValue(double value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A double value.
      * 

      *
      * double double_value = 3;
-     *
      * @return This builder for chaining.
      */
     public Builder clearDoubleValue() {
@@ -1672,13 +1533,8 @@ public Builder clearDoubleValue() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Timestamp,
-            com.google.protobuf.Timestamp.Builder,
-            com.google.protobuf.TimestampOrBuilder>
-        timestampValueBuilder_;
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> timestampValueBuilder_;
     /**
-     *
-     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1686,15 +1542,12 @@ public Builder clearDoubleValue() {
      * 

      *
      * .google.protobuf.Timestamp timestamp_value = 10;
-     *
      * @return Whether the timestampValue field is set.
      */
     public boolean hasTimestampValue() {
       return valueTypeCase_ == 10;
     }
     /**
-     *
-     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1702,7 +1555,6 @@ public boolean hasTimestampValue() {
      * 

      *
      * .google.protobuf.Timestamp timestamp_value = 10;
-     *
      * @return The timestampValue.
      */
     public com.google.protobuf.Timestamp getTimestampValue() {
@@ -1719,8 +1571,6 @@ public com.google.protobuf.Timestamp getTimestampValue() {
       }
     }
     /**
-     *
-     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1743,8 +1593,6 @@ public Builder setTimestampValue(com.google.protobuf.Timestamp value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1753,7 +1601,8 @@ public Builder setTimestampValue(com.google.protobuf.Timestamp value) {
      *
      * .google.protobuf.Timestamp timestamp_value = 10;
      */
-    public Builder setTimestampValue(com.google.protobuf.Timestamp.Builder builderForValue) {
+    public Builder setTimestampValue(
+        com.google.protobuf.Timestamp.Builder builderForValue) {
       if (timestampValueBuilder_ == null) {
         valueType_ = builderForValue.build();
         onChanged();
@@ -1764,8 +1613,6 @@ public Builder setTimestampValue(com.google.protobuf.Timestamp.Builder builderFo
       return this;
     }
     /**
-     *
-     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1776,12 +1623,10 @@ public Builder setTimestampValue(com.google.protobuf.Timestamp.Builder builderFo
      */
     public Builder mergeTimestampValue(com.google.protobuf.Timestamp value) {
       if (timestampValueBuilder_ == null) {
-        if (valueTypeCase_ == 10
-            && valueType_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
-          valueType_ =
-              com.google.protobuf.Timestamp.newBuilder((com.google.protobuf.Timestamp) valueType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (valueTypeCase_ == 10 &&
+            valueType_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+          valueType_ = com.google.protobuf.Timestamp.newBuilder((com.google.protobuf.Timestamp) valueType_)
+              .mergeFrom(value).buildPartial();
         } else {
           valueType_ = value;
         }
@@ -1796,8 +1641,6 @@ public Builder mergeTimestampValue(com.google.protobuf.Timestamp value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1823,8 +1666,6 @@ public Builder clearTimestampValue() {
       return this;
     }
     /**
-     *
-     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1837,8 +1678,6 @@ public com.google.protobuf.Timestamp.Builder getTimestampValueBuilder() {
       return getTimestampValueFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1858,8 +1697,6 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * A timestamp value.
      * When stored in the Datastore, precise only to microseconds;
@@ -1869,56 +1706,43 @@ public com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder() {
      * .google.protobuf.Timestamp timestamp_value = 10;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.protobuf.Timestamp,
-            com.google.protobuf.Timestamp.Builder,
-            com.google.protobuf.TimestampOrBuilder>
+        com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
         getTimestampValueFieldBuilder() {
       if (timestampValueBuilder_ == null) {
         if (!(valueTypeCase_ == 10)) {
           valueType_ = com.google.protobuf.Timestamp.getDefaultInstance();
         }
-        timestampValueBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.protobuf.Timestamp,
-                com.google.protobuf.Timestamp.Builder,
-                com.google.protobuf.TimestampOrBuilder>(
-                (com.google.protobuf.Timestamp) valueType_, getParentForChildren(), isClean());
+        timestampValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
+                (com.google.protobuf.Timestamp) valueType_,
+                getParentForChildren(),
+                isClean());
         valueType_ = null;
       }
       valueTypeCase_ = 10;
-      onChanged();
-      ;
+      onChanged();;
       return timestampValueBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
-        keyValueBuilder_;
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> keyValueBuilder_;
     /**
-     *
-     *
      * 
      * A key value.
      * 

      *
      * .google.datastore.v1.Key key_value = 5;
-     *
      * @return Whether the keyValue field is set.
      */
     public boolean hasKeyValue() {
       return valueTypeCase_ == 5;
     }
     /**
-     *
-     *
      * 
      * A key value.
      * 

      *
      * .google.datastore.v1.Key key_value = 5;
-     *
      * @return The keyValue.
      */
     public com.google.datastore.v1.Key getKeyValue() {
@@ -1935,8 +1759,6 @@ public com.google.datastore.v1.Key getKeyValue() {
       }
     }
     /**
-     *
-     *
      * 
      * A key value.
      * 

@@ -1957,15 +1779,14 @@ public Builder setKeyValue(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A key value.
      * 

      *
      * .google.datastore.v1.Key key_value = 5;
      */
-    public Builder setKeyValue(com.google.datastore.v1.Key.Builder builderForValue) {
+    public Builder setKeyValue(
+        com.google.datastore.v1.Key.Builder builderForValue) {
       if (keyValueBuilder_ == null) {
         valueType_ = builderForValue.build();
         onChanged();
@@ -1976,8 +1797,6 @@ public Builder setKeyValue(com.google.datastore.v1.Key.Builder builderForValue)
       return this;
     }
     /**
-     *
-     *
      * 
      * A key value.
      * 

@@ -1986,11 +1805,10 @@ public Builder setKeyValue(com.google.datastore.v1.Key.Builder builderForValue)
      */
     public Builder mergeKeyValue(com.google.datastore.v1.Key value) {
       if (keyValueBuilder_ == null) {
-        if (valueTypeCase_ == 5 && valueType_ != com.google.datastore.v1.Key.getDefaultInstance()) {
-          valueType_ =
-              com.google.datastore.v1.Key.newBuilder((com.google.datastore.v1.Key) valueType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (valueTypeCase_ == 5 &&
+            valueType_ != com.google.datastore.v1.Key.getDefaultInstance()) {
+          valueType_ = com.google.datastore.v1.Key.newBuilder((com.google.datastore.v1.Key) valueType_)
+              .mergeFrom(value).buildPartial();
         } else {
           valueType_ = value;
         }
@@ -2005,8 +1823,6 @@ public Builder mergeKeyValue(com.google.datastore.v1.Key value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A key value.
      * 

@@ -2030,8 +1846,6 @@ public Builder clearKeyValue() {
       return this;
     }
     /**
-     *
-     *
      * 
      * A key value.
      * 

@@ -2042,8 +1856,6 @@ public com.google.datastore.v1.Key.Builder getKeyValueBuilder() {
       return getKeyValueFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * A key value.
      * 

@@ -2061,8 +1873,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * A key value.
      * 

@@ -2070,31 +1880,25 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
      * .google.datastore.v1.Key key_value = 5;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Key,
-            com.google.datastore.v1.Key.Builder,
-            com.google.datastore.v1.KeyOrBuilder>
+        com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder> 
         getKeyValueFieldBuilder() {
       if (keyValueBuilder_ == null) {
         if (!(valueTypeCase_ == 5)) {
           valueType_ = com.google.datastore.v1.Key.getDefaultInstance();
         }
-        keyValueBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Key,
-                com.google.datastore.v1.Key.Builder,
-                com.google.datastore.v1.KeyOrBuilder>(
-                (com.google.datastore.v1.Key) valueType_, getParentForChildren(), isClean());
+        keyValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>(
+                (com.google.datastore.v1.Key) valueType_,
+                getParentForChildren(),
+                isClean());
         valueType_ = null;
       }
       valueTypeCase_ = 5;
-      onChanged();
-      ;
+      onChanged();;
       return keyValueBuilder_;
     }
 
     /**
-     *
-     *
      * 
      * A UTF-8 encoded string value.
      * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -2102,7 +1906,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder() {
      * 

      *
      * string string_value = 17;
-     *
      * @return The stringValue.
      */
     public java.lang.String getStringValue() {
@@ -2111,7 +1914,8 @@ public java.lang.String getStringValue() {
         ref = valueType_;
       }
       if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (valueTypeCase_ == 17) {
           valueType_ = s;
@@ -2122,8 +1926,6 @@ public java.lang.String getStringValue() {
       }
     }
     /**
-     *
-     *
      * 
      * A UTF-8 encoded string value.
      * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -2131,17 +1933,18 @@ public java.lang.String getStringValue() {
      * 

      *
      * string string_value = 17;
-     *
      * @return The bytes for stringValue.
      */
-    public com.google.protobuf.ByteString getStringValueBytes() {
+    public com.google.protobuf.ByteString
+        getStringValueBytes() {
       java.lang.Object ref = "";
       if (valueTypeCase_ == 17) {
         ref = valueType_;
       }
       if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
         if (valueTypeCase_ == 17) {
           valueType_ = b;
         }
@@ -2151,8 +1954,6 @@ public com.google.protobuf.ByteString getStringValueBytes() {
       }
     }
     /**
-     *
-     *
      * 
      * A UTF-8 encoded string value.
      * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -2160,22 +1961,20 @@ public com.google.protobuf.ByteString getStringValueBytes() {
      * 

      *
      * string string_value = 17;
-     *
      * @param value The stringValue to set.
      * @return This builder for chaining.
      */
-    public Builder setStringValue(java.lang.String value) {
+    public Builder setStringValue(
+        java.lang.String value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      valueTypeCase_ = 17;
+    throw new NullPointerException();
+  }
+  valueTypeCase_ = 17;
       valueType_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * A UTF-8 encoded string value.
      * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -2183,7 +1982,6 @@ public Builder setStringValue(java.lang.String value) {
      * 

      *
      * string string_value = 17;
-     *
      * @return This builder for chaining.
      */
     public Builder clearStringValue() {
@@ -2195,8 +1993,6 @@ public Builder clearStringValue() {
       return this;
     }
     /**
-     *
-     *
      * 
      * A UTF-8 encoded string value.
      * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -2204,15 +2000,15 @@ public Builder clearStringValue() {
      * 

      *
      * string string_value = 17;
-     *
      * @param value The bytes for stringValue to set.
      * @return This builder for chaining.
      */
-    public Builder setStringValueBytes(com.google.protobuf.ByteString value) {
+    public Builder setStringValueBytes(
+        com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
       valueTypeCase_ = 17;
       valueType_ = value;
       onChanged();
@@ -2220,8 +2016,6 @@ public Builder setStringValueBytes(com.google.protobuf.ByteString value) {
     }
 
     /**
-     *
-     *
      * 
      * A blob value.
      * May have at most 1,000,000 bytes.
@@ -2230,7 +2024,6 @@ public Builder setStringValueBytes(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes blob_value = 18;
-     *
      * @return The blobValue.
      */
     public com.google.protobuf.ByteString getBlobValue() {
@@ -2240,8 +2033,6 @@ public com.google.protobuf.ByteString getBlobValue() {
       return com.google.protobuf.ByteString.EMPTY;
     }
     /**
-     *
-     *
      * 
      * A blob value.
      * May have at most 1,000,000 bytes.
@@ -2250,22 +2041,19 @@ public com.google.protobuf.ByteString getBlobValue() {
      * 

      *
      * bytes blob_value = 18;
-     *
      * @param value The blobValue to set.
      * @return This builder for chaining.
      */
     public Builder setBlobValue(com.google.protobuf.ByteString value) {
       if (value == null) {
-        throw new NullPointerException();
-      }
-      valueTypeCase_ = 18;
+    throw new NullPointerException();
+  }
+  valueTypeCase_ = 18;
       valueType_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * A blob value.
      * May have at most 1,000,000 bytes.
@@ -2274,7 +2062,6 @@ public Builder setBlobValue(com.google.protobuf.ByteString value) {
      * 

      *
      * bytes blob_value = 18;
-     *
      * @return This builder for chaining.
      */
     public Builder clearBlobValue() {
@@ -2287,31 +2074,24 @@ public Builder clearBlobValue() {
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder>
-        geoPointValueBuilder_;
+        com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder> geoPointValueBuilder_;
     /**
-     *
-     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

      *
      * .google.type.LatLng geo_point_value = 8;
-     *
      * @return Whether the geoPointValue field is set.
      */
     public boolean hasGeoPointValue() {
       return valueTypeCase_ == 8;
     }
     /**
-     *
-     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

      *
      * .google.type.LatLng geo_point_value = 8;
-     *
      * @return The geoPointValue.
      */
     public com.google.type.LatLng getGeoPointValue() {
@@ -2328,8 +2108,6 @@ public com.google.type.LatLng getGeoPointValue() {
       }
     }
     /**
-     *
-     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2350,15 +2128,14 @@ public Builder setGeoPointValue(com.google.type.LatLng value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

      *
      * .google.type.LatLng geo_point_value = 8;
      */
-    public Builder setGeoPointValue(com.google.type.LatLng.Builder builderForValue) {
+    public Builder setGeoPointValue(
+        com.google.type.LatLng.Builder builderForValue) {
       if (geoPointValueBuilder_ == null) {
         valueType_ = builderForValue.build();
         onChanged();
@@ -2369,8 +2146,6 @@ public Builder setGeoPointValue(com.google.type.LatLng.Builder builderForValue)
       return this;
     }
     /**
-     *
-     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2379,11 +2154,10 @@ public Builder setGeoPointValue(com.google.type.LatLng.Builder builderForValue)
      */
     public Builder mergeGeoPointValue(com.google.type.LatLng value) {
       if (geoPointValueBuilder_ == null) {
-        if (valueTypeCase_ == 8 && valueType_ != com.google.type.LatLng.getDefaultInstance()) {
-          valueType_ =
-              com.google.type.LatLng.newBuilder((com.google.type.LatLng) valueType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (valueTypeCase_ == 8 &&
+            valueType_ != com.google.type.LatLng.getDefaultInstance()) {
+          valueType_ = com.google.type.LatLng.newBuilder((com.google.type.LatLng) valueType_)
+              .mergeFrom(value).buildPartial();
         } else {
           valueType_ = value;
         }
@@ -2398,8 +2172,6 @@ public Builder mergeGeoPointValue(com.google.type.LatLng value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2423,8 +2195,6 @@ public Builder clearGeoPointValue() {
       return this;
     }
     /**
-     *
-     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2435,8 +2205,6 @@ public com.google.type.LatLng.Builder getGeoPointValueBuilder() {
       return getGeoPointValueFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2454,8 +2222,6 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * A geo point value representing a point on the surface of Earth.
      * 

@@ -2463,34 +2229,27 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
      * .google.type.LatLng geo_point_value = 8;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder>
+        com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder> 
         getGeoPointValueFieldBuilder() {
       if (geoPointValueBuilder_ == null) {
         if (!(valueTypeCase_ == 8)) {
           valueType_ = com.google.type.LatLng.getDefaultInstance();
         }
-        geoPointValueBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.type.LatLng,
-                com.google.type.LatLng.Builder,
-                com.google.type.LatLngOrBuilder>(
-                (com.google.type.LatLng) valueType_, getParentForChildren(), isClean());
+        geoPointValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.type.LatLng, com.google.type.LatLng.Builder, com.google.type.LatLngOrBuilder>(
+                (com.google.type.LatLng) valueType_,
+                getParentForChildren(),
+                isClean());
         valueType_ = null;
       }
       valueTypeCase_ = 8;
-      onChanged();
-      ;
+      onChanged();;
       return geoPointValueBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity,
-            com.google.datastore.v1.Entity.Builder,
-            com.google.datastore.v1.EntityOrBuilder>
-        entityValueBuilder_;
+        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> entityValueBuilder_;
     /**
-     *
-     *
      * 
      * An entity value.
      * - May have no key.
@@ -2499,15 +2258,12 @@ public com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder() {
      * 

      *
      * .google.datastore.v1.Entity entity_value = 6;
-     *
      * @return Whether the entityValue field is set.
      */
     public boolean hasEntityValue() {
       return valueTypeCase_ == 6;
     }
     /**
-     *
-     *
      * 
      * An entity value.
      * - May have no key.
@@ -2516,7 +2272,6 @@ public boolean hasEntityValue() {
      * 

      *
      * .google.datastore.v1.Entity entity_value = 6;
-     *
      * @return The entityValue.
      */
     public com.google.datastore.v1.Entity getEntityValue() {
@@ -2533,8 +2288,6 @@ public com.google.datastore.v1.Entity getEntityValue() {
       }
     }
     /**
-     *
-     *
      * 
      * An entity value.
      * - May have no key.
@@ -2558,8 +2311,6 @@ public Builder setEntityValue(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * An entity value.
      * - May have no key.
@@ -2569,7 +2320,8 @@ public Builder setEntityValue(com.google.datastore.v1.Entity value) {
      *
      * .google.datastore.v1.Entity entity_value = 6;
      */
-    public Builder setEntityValue(com.google.datastore.v1.Entity.Builder builderForValue) {
+    public Builder setEntityValue(
+        com.google.datastore.v1.Entity.Builder builderForValue) {
       if (entityValueBuilder_ == null) {
         valueType_ = builderForValue.build();
         onChanged();
@@ -2580,8 +2332,6 @@ public Builder setEntityValue(com.google.datastore.v1.Entity.Builder builderForV
       return this;
     }
     /**
-     *
-     *
      * 
      * An entity value.
      * - May have no key.
@@ -2593,12 +2343,10 @@ public Builder setEntityValue(com.google.datastore.v1.Entity.Builder builderForV
      */
     public Builder mergeEntityValue(com.google.datastore.v1.Entity value) {
       if (entityValueBuilder_ == null) {
-        if (valueTypeCase_ == 6
-            && valueType_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
-          valueType_ =
-              com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) valueType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (valueTypeCase_ == 6 &&
+            valueType_ != com.google.datastore.v1.Entity.getDefaultInstance()) {
+          valueType_ = com.google.datastore.v1.Entity.newBuilder((com.google.datastore.v1.Entity) valueType_)
+              .mergeFrom(value).buildPartial();
         } else {
           valueType_ = value;
         }
@@ -2613,8 +2361,6 @@ public Builder mergeEntityValue(com.google.datastore.v1.Entity value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * An entity value.
      * - May have no key.
@@ -2641,8 +2387,6 @@ public Builder clearEntityValue() {
       return this;
     }
     /**
-     *
-     *
      * 
      * An entity value.
      * - May have no key.
@@ -2656,8 +2400,6 @@ public com.google.datastore.v1.Entity.Builder getEntityValueBuilder() {
       return getEntityValueFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * An entity value.
      * - May have no key.
@@ -2678,8 +2420,6 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * An entity value.
      * - May have no key.
@@ -2690,36 +2430,27 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
      * .google.datastore.v1.Entity entity_value = 6;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.Entity,
-            com.google.datastore.v1.Entity.Builder,
-            com.google.datastore.v1.EntityOrBuilder>
+        com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder> 
         getEntityValueFieldBuilder() {
       if (entityValueBuilder_ == null) {
         if (!(valueTypeCase_ == 6)) {
           valueType_ = com.google.datastore.v1.Entity.getDefaultInstance();
         }
-        entityValueBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.Entity,
-                com.google.datastore.v1.Entity.Builder,
-                com.google.datastore.v1.EntityOrBuilder>(
-                (com.google.datastore.v1.Entity) valueType_, getParentForChildren(), isClean());
+        entityValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, com.google.datastore.v1.EntityOrBuilder>(
+                (com.google.datastore.v1.Entity) valueType_,
+                getParentForChildren(),
+                isClean());
         valueType_ = null;
       }
       valueTypeCase_ = 6;
-      onChanged();
-      ;
+      onChanged();;
       return entityValueBuilder_;
     }
 
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ArrayValue,
-            com.google.datastore.v1.ArrayValue.Builder,
-            com.google.datastore.v1.ArrayValueOrBuilder>
-        arrayValueBuilder_;
+        com.google.datastore.v1.ArrayValue, com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder> arrayValueBuilder_;
     /**
-     *
-     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2728,15 +2459,12 @@ public com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder() {
      * 

      *
      * .google.datastore.v1.ArrayValue array_value = 9;
-     *
      * @return Whether the arrayValue field is set.
      */
     public boolean hasArrayValue() {
       return valueTypeCase_ == 9;
     }
     /**
-     *
-     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2745,7 +2473,6 @@ public boolean hasArrayValue() {
      * 

      *
      * .google.datastore.v1.ArrayValue array_value = 9;
-     *
      * @return The arrayValue.
      */
     public com.google.datastore.v1.ArrayValue getArrayValue() {
@@ -2762,8 +2489,6 @@ public com.google.datastore.v1.ArrayValue getArrayValue() {
       }
     }
     /**
-     *
-     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2787,8 +2512,6 @@ public Builder setArrayValue(com.google.datastore.v1.ArrayValue value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2798,7 +2521,8 @@ public Builder setArrayValue(com.google.datastore.v1.ArrayValue value) {
      *
      * .google.datastore.v1.ArrayValue array_value = 9;
      */
-    public Builder setArrayValue(com.google.datastore.v1.ArrayValue.Builder builderForValue) {
+    public Builder setArrayValue(
+        com.google.datastore.v1.ArrayValue.Builder builderForValue) {
       if (arrayValueBuilder_ == null) {
         valueType_ = builderForValue.build();
         onChanged();
@@ -2809,8 +2533,6 @@ public Builder setArrayValue(com.google.datastore.v1.ArrayValue.Builder builderF
       return this;
     }
     /**
-     *
-     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2822,13 +2544,10 @@ public Builder setArrayValue(com.google.datastore.v1.ArrayValue.Builder builderF
      */
     public Builder mergeArrayValue(com.google.datastore.v1.ArrayValue value) {
       if (arrayValueBuilder_ == null) {
-        if (valueTypeCase_ == 9
-            && valueType_ != com.google.datastore.v1.ArrayValue.getDefaultInstance()) {
-          valueType_ =
-              com.google.datastore.v1.ArrayValue.newBuilder(
-                      (com.google.datastore.v1.ArrayValue) valueType_)
-                  .mergeFrom(value)
-                  .buildPartial();
+        if (valueTypeCase_ == 9 &&
+            valueType_ != com.google.datastore.v1.ArrayValue.getDefaultInstance()) {
+          valueType_ = com.google.datastore.v1.ArrayValue.newBuilder((com.google.datastore.v1.ArrayValue) valueType_)
+              .mergeFrom(value).buildPartial();
         } else {
           valueType_ = value;
         }
@@ -2843,8 +2562,6 @@ public Builder mergeArrayValue(com.google.datastore.v1.ArrayValue value) {
       return this;
     }
     /**
-     *
-     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2871,8 +2588,6 @@ public Builder clearArrayValue() {
       return this;
     }
     /**
-     *
-     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2886,8 +2601,6 @@ public com.google.datastore.v1.ArrayValue.Builder getArrayValueBuilder() {
       return getArrayValueFieldBuilder().getBuilder();
     }
     /**
-     *
-     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2908,8 +2621,6 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
       }
     }
     /**
-     *
-     *
      * 
      * An array value.
      * Cannot contain another array value.
@@ -2920,135 +2631,113 @@ public com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder() {
      * .google.datastore.v1.ArrayValue array_value = 9;
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-            com.google.datastore.v1.ArrayValue,
-            com.google.datastore.v1.ArrayValue.Builder,
-            com.google.datastore.v1.ArrayValueOrBuilder>
+        com.google.datastore.v1.ArrayValue, com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder> 
         getArrayValueFieldBuilder() {
       if (arrayValueBuilder_ == null) {
         if (!(valueTypeCase_ == 9)) {
           valueType_ = com.google.datastore.v1.ArrayValue.getDefaultInstance();
         }
-        arrayValueBuilder_ =
-            new com.google.protobuf.SingleFieldBuilderV3<
-                com.google.datastore.v1.ArrayValue,
-                com.google.datastore.v1.ArrayValue.Builder,
-                com.google.datastore.v1.ArrayValueOrBuilder>(
-                (com.google.datastore.v1.ArrayValue) valueType_, getParentForChildren(), isClean());
+        arrayValueBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.datastore.v1.ArrayValue, com.google.datastore.v1.ArrayValue.Builder, com.google.datastore.v1.ArrayValueOrBuilder>(
+                (com.google.datastore.v1.ArrayValue) valueType_,
+                getParentForChildren(),
+                isClean());
         valueType_ = null;
       }
       valueTypeCase_ = 9;
-      onChanged();
-      ;
+      onChanged();;
       return arrayValueBuilder_;
     }
 
-    private int meaning_;
+    private int meaning_ ;
     /**
-     *
-     *
      * 
      * The `meaning` field should only be populated for backwards compatibility.
      * 

      *
      * int32 meaning = 14;
-     *
      * @return The meaning.
      */
     public int getMeaning() {
       return meaning_;
     }
     /**
-     *
-     *
      * 
      * The `meaning` field should only be populated for backwards compatibility.
      * 

      *
      * int32 meaning = 14;
-     *
      * @param value The meaning to set.
      * @return This builder for chaining.
      */
     public Builder setMeaning(int value) {
-
+      
       meaning_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * The `meaning` field should only be populated for backwards compatibility.
      * 

      *
      * int32 meaning = 14;
-     *
      * @return This builder for chaining.
      */
     public Builder clearMeaning() {
-
+      
       meaning_ = 0;
       onChanged();
       return this;
     }
 
-    private boolean excludeFromIndexes_;
+    private boolean excludeFromIndexes_ ;
     /**
-     *
-     *
      * 
      * If the value should be excluded from all indexes including those defined
      * explicitly.
      * 

      *
      * bool exclude_from_indexes = 19;
-     *
      * @return The excludeFromIndexes.
      */
     public boolean getExcludeFromIndexes() {
       return excludeFromIndexes_;
     }
     /**
-     *
-     *
      * 
      * If the value should be excluded from all indexes including those defined
      * explicitly.
      * 

      *
      * bool exclude_from_indexes = 19;
-     *
      * @param value The excludeFromIndexes to set.
      * @return This builder for chaining.
      */
     public Builder setExcludeFromIndexes(boolean value) {
-
+      
       excludeFromIndexes_ = value;
       onChanged();
       return this;
     }
     /**
-     *
-     *
      * 
      * If the value should be excluded from all indexes including those defined
      * explicitly.
      * 

      *
      * bool exclude_from_indexes = 19;
-     *
      * @return This builder for chaining.
      */
     public Builder clearExcludeFromIndexes() {
-
+      
       excludeFromIndexes_ = false;
       onChanged();
       return this;
     }
-
     @java.lang.Override
-    public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
     }
 
@@ -3058,12 +2747,12 @@ public final Builder mergeUnknownFields(
       return super.mergeUnknownFields(unknownFields);
     }
 
+
     // @@protoc_insertion_point(builder_scope:google.datastore.v1.Value)
   }
 
   // @@protoc_insertion_point(class_scope:google.datastore.v1.Value)
   private static final com.google.datastore.v1.Value DEFAULT_INSTANCE;
-
   static {
     DEFAULT_INSTANCE = new com.google.datastore.v1.Value();
   }
@@ -3072,16 +2761,16 @@ public static com.google.datastore.v1.Value getDefaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
-  private static final com.google.protobuf.Parser PARSER =
-      new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
-        public Value parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Value(input, extensionRegistry);
-        }
-      };
+  private static final com.google.protobuf.Parser
+      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Override
+    public Value parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new Value(input, extensionRegistry);
+    }
+  };
 
   public static com.google.protobuf.Parser parser() {
     return PARSER;
@@ -3096,4 +2785,6 @@ public com.google.protobuf.Parser getParserForType() {
   public com.google.datastore.v1.Value getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
+
 }
+
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java
index 3f61abd94..ee8995a83 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java
@@ -18,78 +18,60 @@
 
 package com.google.datastore.v1;
 
-public interface ValueOrBuilder
-    extends
+public interface ValueOrBuilder extends
     // @@protoc_insertion_point(interface_extends:google.datastore.v1.Value)
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   *
-   *
    * 
    * A null value.
    * 

    *
    * .google.protobuf.NullValue null_value = 11;
-   *
    * @return The enum numeric value on the wire for nullValue.
    */
   int getNullValueValue();
   /**
-   *
-   *
    * 
    * A null value.
    * 

    *
    * .google.protobuf.NullValue null_value = 11;
-   *
    * @return The nullValue.
    */
   com.google.protobuf.NullValue getNullValue();
 
   /**
-   *
-   *
    * 
    * A boolean value.
    * 

    *
    * bool boolean_value = 1;
-   *
    * @return The booleanValue.
    */
   boolean getBooleanValue();
 
   /**
-   *
-   *
    * 
    * An integer value.
    * 

    *
    * int64 integer_value = 2;
-   *
    * @return The integerValue.
    */
   long getIntegerValue();
 
   /**
-   *
-   *
    * 
    * A double value.
    * 

    *
    * double double_value = 3;
-   *
    * @return The doubleValue.
    */
   double getDoubleValue();
 
   /**
-   *
-   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -97,13 +79,10 @@ public interface ValueOrBuilder
    * 

    *
    * .google.protobuf.Timestamp timestamp_value = 10;
-   *
    * @return Whether the timestampValue field is set.
    */
   boolean hasTimestampValue();
   /**
-   *
-   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -111,13 +90,10 @@ public interface ValueOrBuilder
    * 

    *
    * .google.protobuf.Timestamp timestamp_value = 10;
-   *
    * @return The timestampValue.
    */
   com.google.protobuf.Timestamp getTimestampValue();
   /**
-   *
-   *
    * 
    * A timestamp value.
    * When stored in the Datastore, precise only to microseconds;
@@ -129,32 +105,24 @@ public interface ValueOrBuilder
   com.google.protobuf.TimestampOrBuilder getTimestampValueOrBuilder();
 
   /**
-   *
-   *
    * 
    * A key value.
    * 

    *
    * .google.datastore.v1.Key key_value = 5;
-   *
    * @return Whether the keyValue field is set.
    */
   boolean hasKeyValue();
   /**
-   *
-   *
    * 
    * A key value.
    * 

    *
    * .google.datastore.v1.Key key_value = 5;
-   *
    * @return The keyValue.
    */
   com.google.datastore.v1.Key getKeyValue();
   /**
-   *
-   *
    * 
    * A key value.
    * 

@@ -164,8 +132,6 @@ public interface ValueOrBuilder
   com.google.datastore.v1.KeyOrBuilder getKeyValueOrBuilder();
 
   /**
-   *
-   *
    * 
    * A UTF-8 encoded string value.
    * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -173,13 +139,10 @@ public interface ValueOrBuilder
    * 

    *
    * string string_value = 17;
-   *
    * @return The stringValue.
    */
   java.lang.String getStringValue();
   /**
-   *
-   *
    * 
    * A UTF-8 encoded string value.
    * When `exclude_from_indexes` is false (it is indexed) , may have at most 1500 bytes.
@@ -187,14 +150,12 @@ public interface ValueOrBuilder
    * 

    *
    * string string_value = 17;
-   *
    * @return The bytes for stringValue.
    */
-  com.google.protobuf.ByteString getStringValueBytes();
+  com.google.protobuf.ByteString
+      getStringValueBytes();
 
   /**
-   *
-   *
    * 
    * A blob value.
    * May have at most 1,000,000 bytes.
@@ -203,38 +164,29 @@ public interface ValueOrBuilder
    * 

    *
    * bytes blob_value = 18;
-   *
    * @return The blobValue.
    */
   com.google.protobuf.ByteString getBlobValue();
 
   /**
-   *
-   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

    *
    * .google.type.LatLng geo_point_value = 8;
-   *
    * @return Whether the geoPointValue field is set.
    */
   boolean hasGeoPointValue();
   /**
-   *
-   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

    *
    * .google.type.LatLng geo_point_value = 8;
-   *
    * @return The geoPointValue.
    */
   com.google.type.LatLng getGeoPointValue();
   /**
-   *
-   *
    * 
    * A geo point value representing a point on the surface of Earth.
    * 

@@ -244,8 +196,6 @@ public interface ValueOrBuilder
   com.google.type.LatLngOrBuilder getGeoPointValueOrBuilder();
 
   /**
-   *
-   *
    * 
    * An entity value.
    * - May have no key.
@@ -254,13 +204,10 @@ public interface ValueOrBuilder
    * 

    *
    * .google.datastore.v1.Entity entity_value = 6;
-   *
    * @return Whether the entityValue field is set.
    */
   boolean hasEntityValue();
   /**
-   *
-   *
    * 
    * An entity value.
    * - May have no key.
@@ -269,13 +216,10 @@ public interface ValueOrBuilder
    * 

    *
    * .google.datastore.v1.Entity entity_value = 6;
-   *
    * @return The entityValue.
    */
   com.google.datastore.v1.Entity getEntityValue();
   /**
-   *
-   *
    * 
    * An entity value.
    * - May have no key.
@@ -288,8 +232,6 @@ public interface ValueOrBuilder
   com.google.datastore.v1.EntityOrBuilder getEntityValueOrBuilder();
 
   /**
-   *
-   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -298,13 +240,10 @@ public interface ValueOrBuilder
    * 

    *
    * .google.datastore.v1.ArrayValue array_value = 9;
-   *
    * @return Whether the arrayValue field is set.
    */
   boolean hasArrayValue();
   /**
-   *
-   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -313,13 +252,10 @@ public interface ValueOrBuilder
    * 

    *
    * .google.datastore.v1.ArrayValue array_value = 9;
-   *
    * @return The arrayValue.
    */
   com.google.datastore.v1.ArrayValue getArrayValue();
   /**
-   *
-   *
    * 
    * An array value.
    * Cannot contain another array value.
@@ -332,28 +268,22 @@ public interface ValueOrBuilder
   com.google.datastore.v1.ArrayValueOrBuilder getArrayValueOrBuilder();
 
   /**
-   *
-   *
    * 
    * The `meaning` field should only be populated for backwards compatibility.
    * 

    *
    * int32 meaning = 14;
-   *
    * @return The meaning.
    */
   int getMeaning();
 
   /**
-   *
-   *
    * 
    * If the value should be excluded from all indexes including those defined
    * explicitly.
    * 

    *
    * bool exclude_from_indexes = 19;
-   *
    * @return The excludeFromIndexes.
    */
   boolean getExcludeFromIndexes();
diff --git a/synth.metadata b/synth.metadata
index d9ff8131a..6be5b3709 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,22 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-datastore.git",
-        "sha": "592d4b21f2637ed2f6b60a984ec215239ad2f923"
+        "sha": "b484256c30ac9117eb82688c801966b6ace856df"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "d741cd976975c745d0199987aff0e908b8352992",
-        "internalRef": "305561906"
-      }
-    },
-    {
-      "git": {
-        "name": "synthtool",
-        "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "52638600f387deb98efb5f9c85fec39e82aa9052"
+        "sha": "e0f9d9e1f9de890db765be46f45ca8490723e3eb",
+        "internalRef": "309824146"
       }
     }
   ],