diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 625929230..42327db5e 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:8175681a918181d306d9c370d3262f16b4c724cc73d74111b7d42fc985ca7f93 + digest: sha256:f14e3fefe8e361e85752bd9890c8e56f2fe25f1e89cbb9597e4e3c7a429203a3 diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 89872968a..62dfe5480 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -28,7 +28,7 @@ fi pushd $(dirname "$0")/../../ # install docuploader package -python3 -m pip install gcp-docuploader +python3 -m pip install --require-hashes -r .kokoro/requirements.txt # compile all packages mvn clean install -B -q -DskipTests=true diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 3f49b4ea0..04b076b91 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -28,7 +28,7 @@ fi pushd $(dirname "$0")/../../ # install docuploader package -python3 -m pip install gcp-docuploader +python3 -m pip install --require-hashes -r .kokoro/requirements.txt # compile all packages mvn clean install -B -q -DskipTests=true diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 1dba8de10..61e714d6b 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -16,7 +16,8 @@ set -eo pipefail # Start the releasetool reporter -python3 -m pip install gcp-releasetool +requirementsFile=$(realpath $(dirname "${BASH_SOURCE[0]}")/../requirements.txt) +python3 -m pip install --require-hashes -r $requirementsFile python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script source $(dirname "$0")/common.sh diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in new file mode 100644 index 000000000..cfdc2e7ed --- /dev/null +++ b/.kokoro/requirements.in @@ -0,0 +1,31 @@ +gcp-docuploader==0.6.3 +google-crc32c==1.3.0 +googleapis-common-protos==1.56.3 +gcp-releasetool==1.8.7 +cachetools==4.2.4 +cffi==1.15.1 +jeepney==0.7.1 +jinja2==3.0.3 +markupsafe==2.0.1 +keyring==23.4.1 +packaging==21.3 +protobuf==3.19.5 +pyjwt==2.4.0 +pyparsing==3.0.9 +pycparser==2.21 +pyperclip==1.8.2 +python-dateutil==2.8.2 +requests==2.27.1 +importlib-metadata==4.8.3 +zipp==3.6.0 +google_api_core==2.8.2 +google-cloud-storage==2.0.0 +google-cloud-core==2.3.1 +typing-extensions==4.1.1 +urllib3==1.26.12 +zipp==3.6.0 +rsa==4.9 +six==1.16.0 +attrs==22.1.0 +google-auth==2.11.0 +idna==3.4 \ No newline at end of file diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt new file mode 100644 index 000000000..170f1c63a --- /dev/null +++ b/.kokoro/requirements.txt @@ -0,0 +1,452 @@ +# +# This file is autogenerated by pip-compile with python 3.10 +# To update, run: +# +# pip-compile --allow-unsafe --generate-hashes requirements.in +# +attrs==22.1.0 \ + --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \ + --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c + # via + # -r requirements.in + # gcp-releasetool +cachetools==4.2.4 \ + --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \ + --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1 + # via + # -r requirements.in + # google-auth +certifi==2022.9.14 \ + --hash=sha256:36973885b9542e6bd01dea287b2b4b3b21236307c56324fcc3f1160f2d655ed5 \ + --hash=sha256:e232343de1ab72c2aa521b625c80f699e356830fd0e2c620b465b304b17b0516 + # via requests +cffi==1.15.1 \ + --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ + --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ + --hash=sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104 \ + --hash=sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426 \ + --hash=sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405 \ + --hash=sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375 \ + --hash=sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a \ + --hash=sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e \ + --hash=sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc \ + --hash=sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf \ + --hash=sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185 \ + --hash=sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497 \ + --hash=sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3 \ + --hash=sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35 \ + --hash=sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c \ + --hash=sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83 \ + --hash=sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21 \ + --hash=sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca \ + --hash=sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984 \ + --hash=sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac \ + --hash=sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd \ + --hash=sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee \ + --hash=sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a \ + --hash=sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2 \ + --hash=sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192 \ + --hash=sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7 \ + --hash=sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585 \ + --hash=sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f \ + --hash=sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e \ + --hash=sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27 \ + --hash=sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b \ + --hash=sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e \ + --hash=sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e \ + --hash=sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d \ + --hash=sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c \ + --hash=sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415 \ + --hash=sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82 \ + --hash=sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02 \ + --hash=sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314 \ + --hash=sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325 \ + --hash=sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c \ + --hash=sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3 \ + --hash=sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914 \ + --hash=sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045 \ + --hash=sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d \ + --hash=sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9 \ + --hash=sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5 \ + --hash=sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2 \ + --hash=sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c \ + --hash=sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3 \ + --hash=sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2 \ + --hash=sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8 \ + --hash=sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d \ + --hash=sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d \ + --hash=sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 \ + --hash=sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162 \ + --hash=sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76 \ + --hash=sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4 \ + --hash=sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e \ + --hash=sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9 \ + --hash=sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6 \ + --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \ + --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \ + --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0 + # via + # -r requirements.in + # cryptography +charset-normalizer==2.0.12 \ + --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \ + --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df + # via requests +click==8.0.4 \ + --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ + --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb + # via + # gcp-docuploader + # gcp-releasetool +colorlog==6.7.0 \ + --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \ + --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 + # via gcp-docuploader +cryptography==38.0.1 \ + --hash=sha256:0297ffc478bdd237f5ca3a7dc96fc0d315670bfa099c04dc3a4a2172008a405a \ + --hash=sha256:10d1f29d6292fc95acb597bacefd5b9e812099d75a6469004fd38ba5471a977f \ + --hash=sha256:16fa61e7481f4b77ef53991075de29fc5bacb582a1244046d2e8b4bb72ef66d0 \ + --hash=sha256:194044c6b89a2f9f169df475cc167f6157eb9151cc69af8a2a163481d45cc407 \ + --hash=sha256:1db3d807a14931fa317f96435695d9ec386be7b84b618cc61cfa5d08b0ae33d7 \ + --hash=sha256:3261725c0ef84e7592597606f6583385fed2a5ec3909f43bc475ade9729a41d6 \ + --hash=sha256:3b72c360427889b40f36dc214630e688c2fe03e16c162ef0aa41da7ab1455153 \ + --hash=sha256:3e3a2599e640927089f932295a9a247fc40a5bdf69b0484532f530471a382750 \ + --hash=sha256:3fc26e22840b77326a764ceb5f02ca2d342305fba08f002a8c1f139540cdfaad \ + --hash=sha256:5067ee7f2bce36b11d0e334abcd1ccf8c541fc0bbdaf57cdd511fdee53e879b6 \ + --hash=sha256:52e7bee800ec869b4031093875279f1ff2ed12c1e2f74923e8f49c916afd1d3b \ + --hash=sha256:64760ba5331e3f1794d0bcaabc0d0c39e8c60bf67d09c93dc0e54189dfd7cfe5 \ + --hash=sha256:765fa194a0f3372d83005ab83ab35d7c5526c4e22951e46059b8ac678b44fa5a \ + --hash=sha256:79473cf8a5cbc471979bd9378c9f425384980fcf2ab6534b18ed7d0d9843987d \ + --hash=sha256:896dd3a66959d3a5ddcfc140a53391f69ff1e8f25d93f0e2e7830c6de90ceb9d \ + --hash=sha256:89ed49784ba88c221756ff4d4755dbc03b3c8d2c5103f6d6b4f83a0fb1e85294 \ + --hash=sha256:ac7e48f7e7261207d750fa7e55eac2d45f720027d5703cd9007e9b37bbb59ac0 \ + --hash=sha256:ad7353f6ddf285aeadfaf79e5a6829110106ff8189391704c1d8801aa0bae45a \ + --hash=sha256:b0163a849b6f315bf52815e238bc2b2346604413fa7c1601eea84bcddb5fb9ac \ + --hash=sha256:b6c9b706316d7b5a137c35e14f4103e2115b088c412140fdbd5f87c73284df61 \ + --hash=sha256:c2e5856248a416767322c8668ef1845ad46ee62629266f84a8f007a317141013 \ + --hash=sha256:ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e \ + --hash=sha256:d1a5bd52d684e49a36582193e0b89ff267704cd4025abefb9e26803adeb3e5fb \ + --hash=sha256:d3971e2749a723e9084dd507584e2a2761f78ad2c638aa31e80bc7a15c9db4f9 \ + --hash=sha256:d4ef6cc305394ed669d4d9eebf10d3a101059bdcf2669c366ec1d14e4fb227bd \ + --hash=sha256:d9e69ae01f99abe6ad646947bba8941e896cb3aa805be2597a0400e0764b5818 + # via + # gcp-releasetool + # secretstorage +gcp-docuploader==0.6.3 \ + --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ + --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b + # via -r requirements.in +gcp-releasetool==1.8.7 \ + --hash=sha256:3d2a67c9db39322194afb3b427e9cb0476ce8f2a04033695f0aeb63979fc2b37 \ + --hash=sha256:5e4d28f66e90780d77f3ecf1e9155852b0c3b13cbccb08ab07e66b2357c8da8d + # via -r requirements.in +google-api-core==2.8.2 \ + --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ + --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50 + # via + # -r requirements.in + # google-cloud-core + # google-cloud-storage +google-auth==2.11.0 \ + --hash=sha256:be62acaae38d0049c21ca90f27a23847245c9f161ff54ede13af2cb6afecbac9 \ + --hash=sha256:ed65ecf9f681832298e29328e1ef0a3676e3732b2e56f41532d45f70a22de0fb + # via + # -r requirements.in + # gcp-releasetool + # google-api-core + # google-cloud-core + # google-cloud-storage +google-cloud-core==2.3.1 \ + --hash=sha256:113ba4f492467d5bd442c8d724c1a25ad7384045c3178369038840ecdd19346c \ + --hash=sha256:34334359cb04187bdc80ddcf613e462dfd7a3aabbc3fe4d118517ab4b9303d53 + # via + # -r requirements.in + # google-cloud-storage +google-cloud-storage==2.0.0 \ + --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \ + --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7 + # via + # -r requirements.in + # gcp-docuploader +google-crc32c==1.3.0 \ + --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \ + --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \ + --hash=sha256:12674a4c3b56b706153a358eaa1018c4137a5a04635b92b4652440d3d7386206 \ + --hash=sha256:127f9cc3ac41b6a859bd9dc4321097b1a4f6aa7fdf71b4f9227b9e3ebffb4422 \ + --hash=sha256:13af315c3a0eec8bb8b8d80b8b128cb3fcd17d7e4edafc39647846345a3f003a \ + --hash=sha256:1926fd8de0acb9d15ee757175ce7242e235482a783cd4ec711cc999fc103c24e \ + --hash=sha256:226f2f9b8e128a6ca6a9af9b9e8384f7b53a801907425c9a292553a3a7218ce0 \ + --hash=sha256:276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df \ + --hash=sha256:318f73f5484b5671f0c7f5f63741ab020a599504ed81d209b5c7129ee4667407 \ + --hash=sha256:3bbce1be3687bbfebe29abdb7631b83e6b25da3f4e1856a1611eb21854b689ea \ + --hash=sha256:42ae4781333e331a1743445931b08ebdad73e188fd554259e772556fc4937c48 \ + --hash=sha256:58be56ae0529c664cc04a9c76e68bb92b091e0194d6e3c50bea7e0f266f73713 \ + --hash=sha256:5da2c81575cc3ccf05d9830f9e8d3c70954819ca9a63828210498c0774fda1a3 \ + --hash=sha256:6311853aa2bba4064d0c28ca54e7b50c4d48e3de04f6770f6c60ebda1e975267 \ + --hash=sha256:650e2917660e696041ab3dcd7abac160b4121cd9a484c08406f24c5964099829 \ + --hash=sha256:6a4db36f9721fdf391646685ecffa404eb986cbe007a3289499020daf72e88a2 \ + --hash=sha256:779cbf1ce375b96111db98fca913c1f5ec11b1d870e529b1dc7354b2681a8c3a \ + --hash=sha256:7f6fe42536d9dcd3e2ffb9d3053f5d05221ae3bbcefbe472bdf2c71c793e3183 \ + --hash=sha256:891f712ce54e0d631370e1f4997b3f182f3368179198efc30d477c75d1f44942 \ + --hash=sha256:95c68a4b9b7828ba0428f8f7e3109c5d476ca44996ed9a5f8aac6269296e2d59 \ + --hash=sha256:96a8918a78d5d64e07c8ea4ed2bc44354e3f93f46a4866a40e8db934e4c0d74b \ + --hash=sha256:9c3cf890c3c0ecfe1510a452a165431b5831e24160c5fcf2071f0f85ca5a47cd \ + --hash=sha256:9f58099ad7affc0754ae42e6d87443299f15d739b0ce03c76f515153a5cda06c \ + --hash=sha256:a0b9e622c3b2b8d0ce32f77eba617ab0d6768b82836391e4f8f9e2074582bf02 \ + --hash=sha256:a7f9cbea4245ee36190f85fe1814e2d7b1e5f2186381b082f5d59f99b7f11328 \ + --hash=sha256:bab4aebd525218bab4ee615786c4581952eadc16b1ff031813a2fd51f0cc7b08 \ + --hash=sha256:c124b8c8779bf2d35d9b721e52d4adb41c9bfbde45e6a3f25f0820caa9aba73f \ + --hash=sha256:c9da0a39b53d2fab3e5467329ed50e951eb91386e9d0d5b12daf593973c3b168 \ + --hash=sha256:ca60076c388728d3b6ac3846842474f4250c91efbfe5afa872d3ffd69dd4b318 \ + --hash=sha256:cb6994fff247987c66a8a4e550ef374671c2b82e3c0d2115e689d21e511a652d \ + --hash=sha256:d1c1d6236feab51200272d79b3d3e0f12cf2cbb12b208c835b175a21efdb0a73 \ + --hash=sha256:dd7760a88a8d3d705ff562aa93f8445ead54f58fd482e4f9e2bafb7e177375d4 \ + --hash=sha256:dda4d8a3bb0b50f540f6ff4b6033f3a74e8bf0bd5320b70fab2c03e512a62812 \ + --hash=sha256:e0f1ff55dde0ebcfbef027edc21f71c205845585fffe30d4ec4979416613e9b3 \ + --hash=sha256:e7a539b9be7b9c00f11ef16b55486141bc2cdb0c54762f84e3c6fc091917436d \ + --hash=sha256:eb0b14523758e37802f27b7f8cd973f5f3d33be7613952c0df904b68c4842f0e \ + --hash=sha256:ed447680ff21c14aaceb6a9f99a5f639f583ccfe4ce1a5e1d48eb41c3d6b3217 \ + --hash=sha256:f52a4ad2568314ee713715b1e2d79ab55fab11e8b304fd1462ff5cccf4264b3e \ + --hash=sha256:fbd60c6aaa07c31d7754edbc2334aef50601b7f1ada67a96eb1eb57c7c72378f \ + --hash=sha256:fc28e0db232c62ca0c3600884933178f0825c99be4474cdd645e378a10588125 \ + --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \ + --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \ + --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3 + # via + # -r requirements.in + # google-resumable-media +google-resumable-media==2.3.3 \ + --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ + --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 + # via google-cloud-storage +googleapis-common-protos==1.56.3 \ + --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \ + --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461 + # via + # -r requirements.in + # google-api-core +idna==3.4 \ + --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ + --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2 + # via + # -r requirements.in + # requests +importlib-metadata==4.8.3 \ + --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \ + --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668 + # via + # -r requirements.in + # keyring +jeepney==0.7.1 \ + --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \ + --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f + # via + # -r requirements.in + # keyring + # secretstorage +jinja2==3.0.3 \ + --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \ + --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 + # via + # -r requirements.in + # gcp-releasetool +keyring==23.4.1 \ + --hash=sha256:17e49fb0d6883c2b4445359434dba95aad84aabb29bbff044ad0ed7100232eca \ + --hash=sha256:89cbd74d4683ed164c8082fb38619341097741323b3786905c6dac04d6915a55 + # via + # -r requirements.in + # gcp-releasetool +markupsafe==2.0.1 \ + --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \ + --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \ + --hash=sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b \ + --hash=sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194 \ + --hash=sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567 \ + --hash=sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff \ + --hash=sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724 \ + --hash=sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74 \ + --hash=sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646 \ + --hash=sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35 \ + --hash=sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6 \ + --hash=sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a \ + --hash=sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6 \ + --hash=sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad \ + --hash=sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26 \ + --hash=sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38 \ + --hash=sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac \ + --hash=sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7 \ + --hash=sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6 \ + --hash=sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047 \ + --hash=sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75 \ + --hash=sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f \ + --hash=sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b \ + --hash=sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135 \ + --hash=sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8 \ + --hash=sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a \ + --hash=sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a \ + --hash=sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1 \ + --hash=sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9 \ + --hash=sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864 \ + --hash=sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914 \ + --hash=sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee \ + --hash=sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f \ + --hash=sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18 \ + --hash=sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8 \ + --hash=sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2 \ + --hash=sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d \ + --hash=sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b \ + --hash=sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b \ + --hash=sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86 \ + --hash=sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6 \ + --hash=sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f \ + --hash=sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb \ + --hash=sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833 \ + --hash=sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28 \ + --hash=sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e \ + --hash=sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415 \ + --hash=sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902 \ + --hash=sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f \ + --hash=sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d \ + --hash=sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9 \ + --hash=sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d \ + --hash=sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145 \ + --hash=sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066 \ + --hash=sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c \ + --hash=sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1 \ + --hash=sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a \ + --hash=sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207 \ + --hash=sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f \ + --hash=sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53 \ + --hash=sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd \ + --hash=sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134 \ + --hash=sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85 \ + --hash=sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9 \ + --hash=sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5 \ + --hash=sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94 \ + --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \ + --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \ + --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872 + # via + # -r requirements.in + # jinja2 +packaging==21.3 \ + --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ + --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 + # via + # -r requirements.in + # gcp-releasetool +protobuf==3.19.5 \ + --hash=sha256:1867f93b06a183f87696871bb8d1e99ee71dbb69d468ce1f0cc8bf3d30f982f3 \ + --hash=sha256:3c4160b601220627f7e91154e572baf5e161a9c3f445a8242d536ee3d0b7b17c \ + --hash=sha256:4ee2af7051d3b10c8a4fe6fd1a2c69f201fea36aeee7086cf202a692e1b99ee1 \ + --hash=sha256:5266c36cc0af3bb3dbf44f199d225b33da66a9a5c3bdc2b14865ad10eddf0e37 \ + --hash=sha256:5470f892961af464ae6eaf0f3099e2c1190ae8c7f36f174b89491281341f79ca \ + --hash=sha256:66d14b5b90090353efe75c9fb1bf65ef7267383034688d255b500822e37d5c2f \ + --hash=sha256:67efb5d20618020aa9596e17bfc37ca068c28ec0c1507d9507f73c93d46c9855 \ + --hash=sha256:696e6cfab94cc15a14946f2bf72719dced087d437adbd994fff34f38986628bc \ + --hash=sha256:6a02172b9650f819d01fb8e224fc69b0706458fc1ab4f1c669281243c71c1a5e \ + --hash=sha256:6eca9ae238ba615d702387a2ddea635d535d769994a9968c09a4ca920c487ab9 \ + --hash=sha256:950abd6c00e7b51f87ae8b18a0ce4d69fea217f62f171426e77de5061f6d9850 \ + --hash=sha256:9e1d74032f56ff25f417cfe84c8147047732e5059137ca42efad20cbbd25f5e0 \ + --hash=sha256:9e42b1cf2ecd8a1bd161239e693f22035ba99905ae6d7efeac8a0546c7ec1a27 \ + --hash=sha256:9f957ef53e872d58a0afd3bf6d80d48535d28c99b40e75e6634cbc33ea42fd54 \ + --hash=sha256:a89aa0c042e61e11ade320b802d6db4ee5391d8d973e46d3a48172c1597789f8 \ + --hash=sha256:c0f80876a8ff0ae7064084ed094eb86497bd5a3812e6fc96a05318b92301674e \ + --hash=sha256:c44e3282cff74ad18c7e8a0375f407f69ee50c2116364b44492a196293e08b21 \ + --hash=sha256:d249519ba5ecf5dd6b18150c9b6bcde510b273714b696f3923ff8308fc11ae49 \ + --hash=sha256:d3973a2d58aefc7d1230725c2447ce7f86a71cbc094b86a77c6ee1505ac7cdb1 \ + --hash=sha256:dca2284378a5f2a86ffed35c6ac147d14c48b525eefcd1083e5a9ce28dfa8657 \ + --hash=sha256:e63b0b3c42e51c94add62b010366cd4979cb6d5f06158bcae8faac4c294f91e1 \ + --hash=sha256:f2b599a21c9a32e171ec29a2ac54e03297736c578698e11b099d031f79da114b \ + --hash=sha256:f2bde37667b18c2b5280df83bc799204394a5d2d774e4deaf9de0eb741df6833 \ + --hash=sha256:f4f909f4dde413dec435a44b0894956d55bb928ded7d6e3c726556ca4c796e84 \ + --hash=sha256:f976234e20ab2785f54224bcdafa027674e23663b132fa3ca0caa291a6cfbde7 \ + --hash=sha256:f9cebda093c2f6bfed88f1c17cdade09d4d96096421b344026feee236532d4de + # via + # -r requirements.in + # gcp-docuploader + # gcp-releasetool + # google-api-core + # google-cloud-storage + # googleapis-common-protos +pyasn1==0.4.8 \ + --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ + --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba + # via + # pyasn1-modules + # rsa +pyasn1-modules==0.2.8 \ + --hash=sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e \ + --hash=sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74 + # via google-auth +pycparser==2.21 \ + --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ + --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 + # via + # -r requirements.in + # cffi +pyjwt==2.4.0 \ + --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \ + --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba + # via + # -r requirements.in + # gcp-releasetool +pyparsing==3.0.9 \ + --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ + --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc + # via + # -r requirements.in + # packaging +pyperclip==1.8.2 \ + --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57 + # via + # -r requirements.in + # gcp-releasetool +python-dateutil==2.8.2 \ + --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ + --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 + # via + # -r requirements.in + # gcp-releasetool +requests==2.27.1 \ + --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \ + --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d + # via + # -r requirements.in + # gcp-releasetool + # google-api-core + # google-cloud-storage +rsa==4.9 \ + --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \ + --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21 + # via + # -r requirements.in + # google-auth +secretstorage==3.3.3 \ + --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ + --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 + # via keyring +six==1.16.0 \ + --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ + --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 + # via + # -r requirements.in + # gcp-docuploader + # google-auth + # python-dateutil +typing-extensions==4.1.1 \ + --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \ + --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2 + # via -r requirements.in +urllib3==1.26.12 \ + --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \ + --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 + # via + # -r requirements.in + # requests +zipp==3.6.0 \ + --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \ + --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc + # via + # -r requirements.in + # importlib-metadata diff --git a/CHANGELOG.md b/CHANGELOG.md index 33c611ccd..3746743ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # Changelog +## [2.11.5](https://github.com/googleapis/java-datastore/compare/v2.11.4...v2.11.5) (2022-10-03) + + +### Dependencies + +* Convert from `JacksonFactory` to `GsonFactory` ([#780](https://github.com/googleapis/java-datastore/issues/780)) ([d24cae2](https://github.com/googleapis/java-datastore/commit/d24cae20c2c69327b8f097cc56fcb48b5f61c358)) +* Update dependency cachetools to v5 ([#863](https://github.com/googleapis/java-datastore/issues/863)) ([74320c1](https://github.com/googleapis/java-datastore/commit/74320c18bc9ad95fd366a1be5fc2d95105944833)) +* Update dependency certifi to v2022.9.24 ([#842](https://github.com/googleapis/java-datastore/issues/842)) ([1631a67](https://github.com/googleapis/java-datastore/commit/1631a67d037f1b1e09a6653a4867d51a6412f6bb)) +* Update dependency charset-normalizer to v2.1.1 ([#854](https://github.com/googleapis/java-datastore/issues/854)) ([8814084](https://github.com/googleapis/java-datastore/commit/881408421e7c9cea5712e9c7c315ab4671c15d49)) +* Update dependency click to v8.1.3 ([#855](https://github.com/googleapis/java-datastore/issues/855)) ([5935e6e](https://github.com/googleapis/java-datastore/commit/5935e6e871724965f05817a6739369e40b59809b)) +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 ([#866](https://github.com/googleapis/java-datastore/issues/866)) ([af1d1eb](https://github.com/googleapis/java-datastore/commit/af1d1eb3bc3dbbb6637ad6bc686ed9fc7c5b9bd5)) +* Update dependency gcp-releasetool to v1.8.8 ([#843](https://github.com/googleapis/java-datastore/issues/843)) ([10b4e44](https://github.com/googleapis/java-datastore/commit/10b4e449ebdf238ad882842ca75ef5477a0d0292)) +* Update dependency google-api-core to v2.10.1 ([#856](https://github.com/googleapis/java-datastore/issues/856)) ([874166e](https://github.com/googleapis/java-datastore/commit/874166e9d2bff6c61f280494fc6b82845e66257b)) +* Update dependency google-auth to v2.12.0 ([#857](https://github.com/googleapis/java-datastore/issues/857)) ([d832df6](https://github.com/googleapis/java-datastore/commit/d832df63ebbc259a9d86818d6dfdcbfe29dd27ce)) +* Update dependency google-cloud-core to v2.3.2 ([#852](https://github.com/googleapis/java-datastore/issues/852)) ([14aad83](https://github.com/googleapis/java-datastore/commit/14aad838b7edd572ca1df6f67cc1988722c3dee5)) +* Update dependency google-cloud-storage to v2.5.0 ([#858](https://github.com/googleapis/java-datastore/issues/858)) ([17f47bc](https://github.com/googleapis/java-datastore/commit/17f47bcb368887291c41ac863743c46feae3c2cf)) +* Update dependency google-crc32c to v1.5.0 ([#859](https://github.com/googleapis/java-datastore/issues/859)) ([dd58916](https://github.com/googleapis/java-datastore/commit/dd58916e895c6b9e5449a562a53ddca0c33cf530)) +* Update dependency googleapis-common-protos to v1.56.4 ([#853](https://github.com/googleapis/java-datastore/issues/853)) ([416e157](https://github.com/googleapis/java-datastore/commit/416e157a51caaa11b21b0d43ac94a2bd76e4de14)) +* Update dependency importlib-metadata to v4.12.0 ([#860](https://github.com/googleapis/java-datastore/issues/860)) ([0a15a3f](https://github.com/googleapis/java-datastore/commit/0a15a3fc5294b5e8d7b0b86fcd6f65739eb700ca)) +* Update dependency jinja2 to v3.1.2 ([#861](https://github.com/googleapis/java-datastore/issues/861)) ([9fc4af5](https://github.com/googleapis/java-datastore/commit/9fc4af50bc7f69d080a29d4e772026f990e02fe8)) +* Update dependency keyring to v23.9.3 ([#862](https://github.com/googleapis/java-datastore/issues/862)) ([620e5f2](https://github.com/googleapis/java-datastore/commit/620e5f2ebc33a14ebf106bdc8e3731e1ce1bd449)) +* Update dependency markupsafe to v2.1.1 ([#844](https://github.com/googleapis/java-datastore/issues/844)) ([8d64f16](https://github.com/googleapis/java-datastore/commit/8d64f16e20fa8c3e15d48fb44657b412bb55bdc1)) +* Update dependency protobuf to v3.20.2 ([#845](https://github.com/googleapis/java-datastore/issues/845)) ([7b46721](https://github.com/googleapis/java-datastore/commit/7b46721d8db483348decb27818de67feb19851c5)) +* Update dependency protobuf to v4 ([#864](https://github.com/googleapis/java-datastore/issues/864)) ([0bf85e9](https://github.com/googleapis/java-datastore/commit/0bf85e9355dff9321bd84038c1bad249b5a92531)) +* Update dependency pyjwt to v2.5.0 ([#846](https://github.com/googleapis/java-datastore/issues/846)) ([e4edcd1](https://github.com/googleapis/java-datastore/commit/e4edcd1e4c3079ab579d15c7b47e110fb99b6674)) +* Update dependency requests to v2.28.1 ([#847](https://github.com/googleapis/java-datastore/issues/847)) ([08ca8e5](https://github.com/googleapis/java-datastore/commit/08ca8e5af44a4b2b1cfae8996b2f7edfe7109204)) +* Update dependency typing-extensions to v4.3.0 ([#848](https://github.com/googleapis/java-datastore/issues/848)) ([2197874](https://github.com/googleapis/java-datastore/commit/219787455d34a2667587f9577368c36811c0c58b)) +* Update dependency zipp to v3.8.1 ([#849](https://github.com/googleapis/java-datastore/issues/849)) ([18db303](https://github.com/googleapis/java-datastore/commit/18db3030ad51ae0db6465717ee432460b67f696a)) + ## [2.11.4](https://github.com/googleapis/java-datastore/compare/v2.11.3...v2.11.4) (2022-09-22) diff --git a/README.md b/README.md index 73ec12b31..65642fcfb 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-datastore - 2.11.3 + 2.11.4 ``` @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-datastore' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-datastore:2.11.3' +implementation 'com.google.cloud:google-cloud-datastore:2.11.4' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.3" +libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.11.4" ``` ## Authentication diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml index 903cdd4f5..d8662ff57 100644 --- a/datastore-v1-proto-client/pom.xml +++ b/datastore-v1-proto-client/pom.xml @@ -19,12 +19,12 @@ 4.0.0 com.google.cloud.datastore datastore-v1-proto-client - 2.11.4 + 2.11.5 com.google.cloud google-cloud-datastore-parent - 2.11.4 + 2.11.5 jar @@ -50,7 +50,7 @@ com.google.http-client - google-http-client-jackson2 + google-http-client-gson diff --git a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java index da10978cd..23ac315b5 100644 --- a/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java +++ b/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java @@ -22,7 +22,7 @@ import com.google.api.client.http.HttpRequest; import com.google.api.client.http.HttpTransport; import com.google.api.client.json.JsonFactory; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.datastore.v1.ArrayValue; import com.google.datastore.v1.CompositeFilter; import com.google.datastore.v1.Entity; @@ -138,7 +138,7 @@ private static HttpTransport newTransport() throws GeneralSecurityException, IOE } static JsonFactory newJsonFactory() { - return new JacksonFactory(); + return new GsonFactory(); } /** diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml index 714e77d8c..9c5186304 100644 --- a/google-cloud-datastore-bom/pom.xml +++ b/google-cloud-datastore-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datastore-bom - 2.11.4 + 2.11.5 pom com.google.cloud @@ -52,22 +52,22 @@ com.google.cloud google-cloud-datastore - 2.11.4 + 2.11.5 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.11.4 + 2.11.5 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.102.4 + 0.102.5 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.11.4 + 2.11.5 diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml index e187db123..d5a22486e 100644 --- a/google-cloud-datastore/pom.xml +++ b/google-cloud-datastore/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-datastore - 2.11.4 + 2.11.5 jar Google Cloud Datastore https://github.com/googleapis/java-datastore @@ -12,7 +12,7 @@ com.google.cloud google-cloud-datastore-parent - 2.11.4 + 2.11.5 google-cloud-datastore diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml index 385172589..4da271bb8 100644 --- a/grpc-google-cloud-datastore-admin-v1/pom.xml +++ b/grpc-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.11.4 + 2.11.5 grpc-google-cloud-datastore-admin-v1 GRPC library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.11.4 + 2.11.5 diff --git a/pom.xml b/pom.xml index a8e4a43b8..ef3df4089 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datastore-parent pom - 2.11.4 + 2.11.5 Google Cloud Datastore Parent https://github.com/googleapis/java-datastore @@ -151,7 +151,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.0.3 + 3.0.4 pom import @@ -159,27 +159,27 @@ com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.11.4 + 2.11.5 com.google.api.grpc grpc-google-cloud-datastore-admin-v1 - 2.11.4 + 2.11.5 com.google.cloud google-cloud-datastore - 2.11.4 + 2.11.5 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.102.4 + 0.102.5 com.google.cloud.datastore datastore-v1-proto-client - 2.11.4 + 2.11.5 com.google.api.grpc diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml index 5256e5f95..2bbfb1874 100644 --- a/proto-google-cloud-datastore-admin-v1/pom.xml +++ b/proto-google-cloud-datastore-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-admin-v1 - 2.11.4 + 2.11.5 proto-google-cloud-datastore-admin-v1 Proto library for google-cloud-datastore com.google.cloud google-cloud-datastore-parent - 2.11.4 + 2.11.5 diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java index f673a574d..213d7ac3a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java @@ -53,103 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CommonMetadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (startTime_ != null) { - subBuilder = startTime_.toBuilder(); - } - startTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(startTime_); - startTime_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (endTime_ != null) { - subBuilder = endTime_.toBuilder(); - } - endTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(endTime_); - endTime_ = subBuilder.buildPartial(); - } - - break; - } - case 24: - { - int rawValue = input.readEnum(); - - operationType_ = rawValue; - break; - } - case 34: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - labels_ = - com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry labels__ = - input.readMessage( - LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - labels_.getMutableMap().put(labels__.getKey(), labels__.getValue()); - break; - } - case 40: - { - int rawValue = input.readEnum(); - - state_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_CommonMetadata_descriptor; @@ -747,7 +650,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io != com.google.datastore.admin.v1.CommonMetadata.State.STATE_UNSPECIFIED.getNumber()) { output.writeEnum(5, state_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -780,7 +683,7 @@ public int getSerializedSize() { != com.google.datastore.admin.v1.CommonMetadata.State.STATE_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(5, state_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -807,7 +710,7 @@ public boolean equals(final java.lang.Object obj) { if (operationType_ != other.operationType_) return false; if (!internalGetLabels().equals(other.internalGetLabels())) return false; if (state_ != other.state_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -834,7 +737,7 @@ public int hashCode() { } hash = (37 * hash) + STATE_FIELD_NUMBER; hash = (53 * hash) + state_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -983,17 +886,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.datastore.admin.v1.CommonMetadata.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1120,7 +1016,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.CommonMetadata other) { if (other.state_ != 0) { setStateValue(other.getStateValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1135,17 +1031,66 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.CommonMetadata parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 24: + { + operationType_ = input.readEnum(); + + break; + } // case 24 + case 34: + { + com.google.protobuf.MapEntry labels__ = + input.readMessage( + LabelsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableLabels() + .getMutableMap() + .put(labels__.getKey(), labels__.getValue()); + break; + } // case 34 + case 40: + { + state_ = input.readEnum(); + + break; + } // case 40 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.admin.v1.CommonMetadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1895,7 +1840,18 @@ public CommonMetadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommonMetadata(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java index 9d73ec24d..e8d4a3e29 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java @@ -53,68 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CreateIndexRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - projectId_ = s; - break; - } - case 26: - { - com.google.datastore.admin.v1.Index.Builder subBuilder = null; - if (index_ != null) { - subBuilder = index_.toBuilder(); - } - index_ = - input.readMessage( - com.google.datastore.admin.v1.Index.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(index_); - index_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_CreateIndexRequest_descriptor; @@ -248,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (index_ != null) { output.writeMessage(3, getIndex()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -263,7 +201,7 @@ public int getSerializedSize() { if (index_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getIndex()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -284,7 +222,7 @@ public boolean equals(final java.lang.Object obj) { if (hasIndex()) { if (!getIndex().equals(other.getIndex())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -301,7 +239,7 @@ public int hashCode() { hash = (37 * hash) + INDEX_FIELD_NUMBER; hash = (53 * hash) + getIndex().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -431,17 +369,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.CreateIndexRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -545,7 +476,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.CreateIndexRequest other) if (other.hasIndex()) { mergeIndex(other.getIndex()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -560,17 +491,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.CreateIndexRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 26: + { + input.readMessage(getIndexFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.admin.v1.CreateIndexRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -902,7 +859,18 @@ public CreateIndexRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CreateIndexRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java index 952001914..cdba4426d 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java @@ -60,59 +60,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DatastoreFirestoreMigrationMetadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - migrationState_ = rawValue; - break; - } - case 16: - { - int rawValue = input.readEnum(); - - migrationStep_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_DatastoreFirestoreMigrationMetadata_descriptor; @@ -226,7 +173,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io != com.google.datastore.admin.v1.MigrationStep.MIGRATION_STEP_UNSPECIFIED.getNumber()) { output.writeEnum(2, migrationStep_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -243,7 +190,7 @@ public int getSerializedSize() { != com.google.datastore.admin.v1.MigrationStep.MIGRATION_STEP_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, migrationStep_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -261,7 +208,7 @@ public boolean equals(final java.lang.Object obj) { if (migrationState_ != other.migrationState_) return false; if (migrationStep_ != other.migrationStep_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -276,7 +223,7 @@ public int hashCode() { hash = (53 * hash) + migrationState_; hash = (37 * hash) + MIGRATION_STEP_FIELD_NUMBER; hash = (53 * hash) + migrationStep_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -413,17 +360,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -521,7 +461,7 @@ public Builder mergeFrom( if (other.migrationStep_ != 0) { setMigrationStepValue(other.getMigrationStepValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -536,19 +476,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + migrationState_ = input.readEnum(); + + break; + } // case 8 + case 16: + { + migrationStep_ = input.readEnum(); + + break; + } // case 16 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.DatastoreFirestoreMigrationMetadata) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -778,7 +742,18 @@ public DatastoreFirestoreMigrationMetadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DatastoreFirestoreMigrationMetadata(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java index 50e889519..e619b5f68 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java @@ -54,59 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DeleteIndexRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - projectId_ = s; - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - indexId_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_DeleteIndexRequest_descriptor; @@ -240,7 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, indexId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -255,7 +202,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, indexId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -273,7 +220,7 @@ public boolean equals(final java.lang.Object obj) { if (!getProjectId().equals(other.getProjectId())) return false; if (!getIndexId().equals(other.getIndexId())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -288,7 +235,7 @@ public int hashCode() { hash = (53 * hash) + getProjectId().hashCode(); hash = (37 * hash) + INDEX_ID_FIELD_NUMBER; hash = (53 * hash) + getIndexId().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -418,17 +365,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.DeleteIndexRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -525,7 +465,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.DeleteIndexRequest other) indexId_ = other.indexId_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -540,17 +480,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.DeleteIndexRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 26: + { + indexId_ = input.readStringRequireUtf8(); + + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.admin.v1.DeleteIndexRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -798,7 +764,18 @@ public DeleteIndexRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DeleteIndexRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java index d714b68b0..d4a5e39af 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java @@ -66,72 +66,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private EntityFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kinds_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - kinds_.add(s); - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - namespaceIds_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000002; - } - namespaceIds_.add(s); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - kinds_ = kinds_.getUnmodifiableView(); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - namespaceIds_ = namespaceIds_.getUnmodifiableView(); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.datastore.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_EntityFilter_descriptor; @@ -309,7 +243,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < namespaceIds_.size(); i++) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, namespaceIds_.getRaw(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -334,7 +268,7 @@ public int getSerializedSize() { size += dataSize; size += 1 * getNamespaceIdsList().size(); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -352,7 +286,7 @@ public boolean equals(final java.lang.Object obj) { if (!getKindsList().equals(other.getKindsList())) return false; if (!getNamespaceIdsList().equals(other.getNamespaceIdsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -371,7 +305,7 @@ public int hashCode() { hash = (37 * hash) + NAMESPACE_IDS_FIELD_NUMBER; hash = (53 * hash) + getNamespaceIdsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -513,17 +447,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.EntityFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -640,7 +567,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.EntityFilter other) { } onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -655,17 +582,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.EntityFilter parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureKindsIsMutable(); + kinds_.add(s); + break; + } // case 10 + case 18: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureNamespaceIdsIsMutable(); + namespaceIds_.add(s); + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.admin.v1.EntityFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1084,7 +1039,18 @@ public EntityFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EntityFilter(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java index 265c5dbec..75d4feb05 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java @@ -52,116 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ExportEntitiesMetadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.datastore.admin.v1.CommonMetadata.Builder subBuilder = null; - if (common_ != null) { - subBuilder = common_.toBuilder(); - } - common_ = - input.readMessage( - com.google.datastore.admin.v1.CommonMetadata.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(common_); - common_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.datastore.admin.v1.Progress.Builder subBuilder = null; - if (progressEntities_ != null) { - subBuilder = progressEntities_.toBuilder(); - } - progressEntities_ = - input.readMessage( - com.google.datastore.admin.v1.Progress.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(progressEntities_); - progressEntities_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.datastore.admin.v1.Progress.Builder subBuilder = null; - if (progressBytes_ != null) { - subBuilder = progressBytes_.toBuilder(); - } - progressBytes_ = - input.readMessage( - com.google.datastore.admin.v1.Progress.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(progressBytes_); - progressBytes_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null; - if (entityFilter_ != null) { - subBuilder = entityFilter_.toBuilder(); - } - entityFilter_ = - input.readMessage( - com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(entityFilter_); - entityFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - java.lang.String s = input.readStringRequireUtf8(); - - outputUrlPrefix_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_ExportEntitiesMetadata_descriptor; @@ -455,7 +345,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, outputUrlPrefix_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -479,7 +369,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, outputUrlPrefix_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -512,7 +402,7 @@ public boolean equals(final java.lang.Object obj) { if (!getEntityFilter().equals(other.getEntityFilter())) return false; } if (!getOutputUrlPrefix().equals(other.getOutputUrlPrefix())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -541,7 +431,7 @@ public int hashCode() { } hash = (37 * hash) + OUTPUT_URL_PREFIX_FIELD_NUMBER; hash = (53 * hash) + getOutputUrlPrefix().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -670,17 +560,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.ExportEntitiesMetadata.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -826,7 +709,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesMetadata ot outputUrlPrefix_ = other.outputUrlPrefix_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -841,18 +724,62 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.ExportEntitiesMetadata parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage( + getProgressEntitiesFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage(getProgressBytesFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + outputUrlPrefix_ = input.readStringRequireUtf8(); + + break; + } // case 42 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.ExportEntitiesMetadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1757,7 +1684,18 @@ public ExportEntitiesMetadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ExportEntitiesMetadata(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java index 945292d02..91a2af640 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java @@ -54,89 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ExportEntitiesRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - projectId_ = s; - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - labels_ = - com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry labels__ = - input.readMessage( - LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - labels_.getMutableMap().put(labels__.getKey(), labels__.getValue()); - break; - } - case 26: - { - com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null; - if (entityFilter_ != null) { - subBuilder = entityFilter_.toBuilder(); - } - entityFilter_ = - input.readMessage( - com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(entityFilter_); - entityFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - java.lang.String s = input.readStringRequireUtf8(); - - outputUrlPrefix_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_ExportEntitiesRequest_descriptor; @@ -460,7 +377,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, outputUrlPrefix_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -488,7 +405,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrlPrefix_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, outputUrlPrefix_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -511,7 +428,7 @@ public boolean equals(final java.lang.Object obj) { if (!getEntityFilter().equals(other.getEntityFilter())) return false; } if (!getOutputUrlPrefix().equals(other.getOutputUrlPrefix())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -534,7 +451,7 @@ public int hashCode() { } hash = (37 * hash) + OUTPUT_URL_PREFIX_FIELD_NUMBER; hash = (53 * hash) + getOutputUrlPrefix().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -684,17 +601,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.datastore.admin.v1.ExportEntitiesRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -810,7 +720,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesRequest oth outputUrlPrefix_ = other.outputUrlPrefix_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -825,18 +735,60 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.ExportEntitiesRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + com.google.protobuf.MapEntry labels__ = + input.readMessage( + LabelsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableLabels() + .getMutableMap() + .put(labels__.getKey(), labels__.getValue()); + break; + } // case 18 + case 26: + { + input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + outputUrlPrefix_ = input.readStringRequireUtf8(); + + break; + } // case 34 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.ExportEntitiesRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1500,7 +1452,18 @@ public ExportEntitiesRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ExportEntitiesRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java index 23ef5aa68..a511b418a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java @@ -53,52 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ExportEntitiesResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - outputUrl_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_ExportEntitiesResponse_descriptor; @@ -186,7 +140,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrl_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, outputUrl_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -198,7 +152,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(outputUrl_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, outputUrl_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -215,7 +169,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.datastore.admin.v1.ExportEntitiesResponse) obj; if (!getOutputUrl().equals(other.getOutputUrl())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -228,7 +182,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + OUTPUT_URL_FIELD_NUMBER; hash = (53 * hash) + getOutputUrl().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -358,17 +312,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.ExportEntitiesResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -458,7 +405,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ExportEntitiesResponse ot outputUrl_ = other.outputUrl_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -473,18 +420,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.ExportEntitiesResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + outputUrl_ = input.readStringRequireUtf8(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.ExportEntitiesResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -641,7 +607,18 @@ public ExportEntitiesResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ExportEntitiesResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java index 173eb97eb..116b9bf41 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java @@ -53,59 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private GetIndexRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - projectId_ = s; - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - indexId_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_GetIndexRequest_descriptor; @@ -239,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, indexId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -254,7 +201,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, indexId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -272,7 +219,7 @@ public boolean equals(final java.lang.Object obj) { if (!getProjectId().equals(other.getProjectId())) return false; if (!getIndexId().equals(other.getIndexId())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -287,7 +234,7 @@ public int hashCode() { hash = (53 * hash) + getProjectId().hashCode(); hash = (37 * hash) + INDEX_ID_FIELD_NUMBER; hash = (53 * hash) + getIndexId().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -416,17 +363,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.GetIndexRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -522,7 +462,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.GetIndexRequest other) { indexId_ = other.indexId_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -537,17 +477,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.GetIndexRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 26: + { + indexId_ = input.readStringRequireUtf8(); + + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.admin.v1.GetIndexRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -795,7 +761,18 @@ public GetIndexRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GetIndexRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java index b1116dde9..5ac3c9c68 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java @@ -52,116 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ImportEntitiesMetadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.datastore.admin.v1.CommonMetadata.Builder subBuilder = null; - if (common_ != null) { - subBuilder = common_.toBuilder(); - } - common_ = - input.readMessage( - com.google.datastore.admin.v1.CommonMetadata.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(common_); - common_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.datastore.admin.v1.Progress.Builder subBuilder = null; - if (progressEntities_ != null) { - subBuilder = progressEntities_.toBuilder(); - } - progressEntities_ = - input.readMessage( - com.google.datastore.admin.v1.Progress.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(progressEntities_); - progressEntities_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.datastore.admin.v1.Progress.Builder subBuilder = null; - if (progressBytes_ != null) { - subBuilder = progressBytes_.toBuilder(); - } - progressBytes_ = - input.readMessage( - com.google.datastore.admin.v1.Progress.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(progressBytes_); - progressBytes_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null; - if (entityFilter_ != null) { - subBuilder = entityFilter_.toBuilder(); - } - entityFilter_ = - input.readMessage( - com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(entityFilter_); - entityFilter_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - java.lang.String s = input.readStringRequireUtf8(); - - inputUrl_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_ImportEntitiesMetadata_descriptor; @@ -449,7 +339,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, inputUrl_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -473,7 +363,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(inputUrl_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, inputUrl_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -506,7 +396,7 @@ public boolean equals(final java.lang.Object obj) { if (!getEntityFilter().equals(other.getEntityFilter())) return false; } if (!getInputUrl().equals(other.getInputUrl())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -535,7 +425,7 @@ public int hashCode() { } hash = (37 * hash) + INPUT_URL_FIELD_NUMBER; hash = (53 * hash) + getInputUrl().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -664,17 +554,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.ImportEntitiesMetadata.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -820,7 +703,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ImportEntitiesMetadata ot inputUrl_ = other.inputUrl_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -835,18 +718,62 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.ImportEntitiesMetadata parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage( + getProgressEntitiesFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage(getProgressBytesFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + inputUrl_ = input.readStringRequireUtf8(); + + break; + } // case 42 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.ImportEntitiesMetadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1736,7 +1663,18 @@ public ImportEntitiesMetadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ImportEntitiesMetadata(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java index 71ef341ac..36151c04c 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java @@ -54,89 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ImportEntitiesRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - projectId_ = s; - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - labels_ = - com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry labels__ = - input.readMessage( - LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - labels_.getMutableMap().put(labels__.getKey(), labels__.getValue()); - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - inputUrl_ = s; - break; - } - case 34: - { - com.google.datastore.admin.v1.EntityFilter.Builder subBuilder = null; - if (entityFilter_ != null) { - subBuilder = entityFilter_.toBuilder(); - } - entityFilter_ = - input.readMessage( - com.google.datastore.admin.v1.EntityFilter.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(entityFilter_); - entityFilter_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_ImportEntitiesRequest_descriptor; @@ -463,7 +380,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (entityFilter_ != null) { output.writeMessage(4, getEntityFilter()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -491,7 +408,7 @@ public int getSerializedSize() { if (entityFilter_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getEntityFilter()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -514,7 +431,7 @@ public boolean equals(final java.lang.Object obj) { if (hasEntityFilter()) { if (!getEntityFilter().equals(other.getEntityFilter())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -537,7 +454,7 @@ public int hashCode() { hash = (37 * hash) + ENTITY_FILTER_FIELD_NUMBER; hash = (53 * hash) + getEntityFilter().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -687,17 +604,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.datastore.admin.v1.ImportEntitiesRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -813,7 +723,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ImportEntitiesRequest oth if (other.hasEntityFilter()) { mergeEntityFilter(other.getEntityFilter()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -828,18 +738,60 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.ImportEntitiesRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + com.google.protobuf.MapEntry labels__ = + input.readMessage( + LabelsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableLabels() + .getMutableMap() + .put(labels__.getKey(), labels__.getValue()); + break; + } // case 18 + case 26: + { + inputUrl_ = input.readStringRequireUtf8(); + + break; + } // case 26 + case 34: + { + input.readMessage(getEntityFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.ImportEntitiesRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1515,7 +1467,18 @@ public ImportEntitiesRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ImportEntitiesRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java index 74be6fcce..da7e169f9 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java @@ -57,97 +57,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Index( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - projectId_ = s; - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - indexId_ = s; - break; - } - case 34: - { - java.lang.String s = input.readStringRequireUtf8(); - - kind_ = s; - break; - } - case 40: - { - int rawValue = input.readEnum(); - - ancestor_ = rawValue; - break; - } - case 50: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - properties_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - properties_.add( - input.readMessage( - com.google.datastore.admin.v1.Index.IndexedProperty.parser(), - extensionRegistry)); - break; - } - case 56: - { - int rawValue = input.readEnum(); - - state_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - properties_ = java.util.Collections.unmodifiableList(properties_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.datastore.admin.v1.IndexProto .internal_static_google_datastore_admin_v1_Index_descriptor; @@ -803,59 +712,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private IndexedProperty( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - 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 (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.IndexProto .internal_static_google_datastore_admin_v1_Index_IndexedProperty_descriptor; @@ -981,7 +837,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io != com.google.datastore.admin.v1.Index.Direction.DIRECTION_UNSPECIFIED.getNumber()) { output.writeEnum(2, direction_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -997,7 +853,7 @@ public int getSerializedSize() { != com.google.datastore.admin.v1.Index.Direction.DIRECTION_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, direction_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1015,7 +871,7 @@ public boolean equals(final java.lang.Object obj) { if (!getName().equals(other.getName())) return false; if (direction_ != other.direction_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1030,7 +886,7 @@ public int hashCode() { hash = (53 * hash) + getName().hashCode(); hash = (37 * hash) + DIRECTION_FIELD_NUMBER; hash = (53 * hash) + direction_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1162,17 +1018,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.Index.IndexedProperty.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1270,7 +1119,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.Index.IndexedProperty oth if (other.direction_ != 0) { setDirectionValue(other.getDirectionValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1285,18 +1134,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.Index.IndexedProperty parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + name_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 16: + { + direction_ = input.readEnum(); + + break; + } // case 16 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.Index.IndexedProperty) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1540,7 +1414,19 @@ public IndexedProperty parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new IndexedProperty(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1899,7 +1785,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (state_ != com.google.datastore.admin.v1.Index.State.STATE_UNSPECIFIED.getNumber()) { output.writeEnum(7, state_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1927,7 +1813,7 @@ public int getSerializedSize() { if (state_ != com.google.datastore.admin.v1.Index.State.STATE_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(7, state_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1948,7 +1834,7 @@ public boolean equals(final java.lang.Object obj) { if (ancestor_ != other.ancestor_) return false; if (!getPropertiesList().equals(other.getPropertiesList())) return false; if (state_ != other.state_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1973,7 +1859,7 @@ public int hashCode() { } hash = (37 * hash) + STATE_FIELD_NUMBER; hash = (53 * hash) + state_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2101,19 +1987,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.Index.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getPropertiesFieldBuilder(); - } } @java.lang.Override @@ -2129,10 +2006,11 @@ public Builder clear() { if (propertiesBuilder_ == null) { properties_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + properties_ = null; propertiesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); state_ = 0; return this; @@ -2270,7 +2148,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.Index other) { if (other.state_ != 0) { setStateValue(other.getStateValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2285,17 +2163,75 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.Index parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 26: + { + indexId_ = input.readStringRequireUtf8(); + + break; + } // case 26 + case 34: + { + kind_ = input.readStringRequireUtf8(); + + break; + } // case 34 + case 40: + { + ancestor_ = input.readEnum(); + + break; + } // case 40 + case 50: + { + com.google.datastore.admin.v1.Index.IndexedProperty m = + input.readMessage( + com.google.datastore.admin.v1.Index.IndexedProperty.parser(), + extensionRegistry); + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + properties_.add(m); + } else { + propertiesBuilder_.addMessage(m); + } + break; + } // case 50 + case 56: + { + state_ = input.readEnum(); + + break; + } // case 56 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.admin.v1.Index) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3249,7 +3185,18 @@ public Index parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Index(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java index d36516420..57d04e97a 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java @@ -52,84 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private IndexOperationMetadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.datastore.admin.v1.CommonMetadata.Builder subBuilder = null; - if (common_ != null) { - subBuilder = common_.toBuilder(); - } - common_ = - input.readMessage( - com.google.datastore.admin.v1.CommonMetadata.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(common_); - common_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.datastore.admin.v1.Progress.Builder subBuilder = null; - if (progressEntities_ != null) { - subBuilder = progressEntities_.toBuilder(); - } - progressEntities_ = - input.readMessage( - com.google.datastore.admin.v1.Progress.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(progressEntities_); - progressEntities_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - indexId_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_IndexOperationMetadata_descriptor; @@ -313,7 +235,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, indexId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -331,7 +253,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(indexId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, indexId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -356,7 +278,7 @@ public boolean equals(final java.lang.Object obj) { if (!getProgressEntities().equals(other.getProgressEntities())) return false; } if (!getIndexId().equals(other.getIndexId())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -377,7 +299,7 @@ public int hashCode() { } hash = (37 * hash) + INDEX_ID_FIELD_NUMBER; hash = (53 * hash) + getIndexId().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -506,17 +428,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.IndexOperationMetadata.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -634,7 +549,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.IndexOperationMetadata ot indexId_ = other.indexId_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -649,18 +564,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.IndexOperationMetadata parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getCommonFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage( + getProgressEntitiesFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + indexId_ = input.readStringRequireUtf8(); + + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.IndexOperationMetadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1173,7 +1120,18 @@ public IndexOperationMetadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new IndexOperationMetadata(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java index b10fa04b4..39cc4d909 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java @@ -55,71 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ListIndexesRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - projectId_ = s; - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - filter_ = s; - break; - } - case 32: - { - pageSize_ = input.readInt32(); - break; - } - case 42: - { - java.lang.String s = input.readStringRequireUtf8(); - - pageToken_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_ListIndexesRequest_descriptor; @@ -315,7 +250,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, pageToken_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -336,7 +271,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, pageToken_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -356,7 +291,7 @@ public boolean equals(final java.lang.Object obj) { if (!getFilter().equals(other.getFilter())) return false; if (getPageSize() != other.getPageSize()) return false; if (!getPageToken().equals(other.getPageToken())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -375,7 +310,7 @@ public int hashCode() { hash = (53 * hash) + getPageSize(); hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER; hash = (53 * hash) + getPageToken().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -505,17 +440,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.ListIndexesRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -625,7 +553,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ListIndexesRequest other) pageToken_ = other.pageToken_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -640,17 +568,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.ListIndexesRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 26: + { + filter_ = input.readStringRequireUtf8(); + + break; + } // case 26 + case 32: + { + pageSize_ = input.readInt32(); + + break; + } // case 32 + case 42: + { + pageToken_ = input.readStringRequireUtf8(); + + break; + } // case 42 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.admin.v1.ListIndexesRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1029,7 +995,18 @@ public ListIndexesRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ListIndexesRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java index 02cacc410..e565bc218 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java @@ -54,67 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ListIndexesResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - indexes_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - indexes_.add( - input.readMessage( - com.google.datastore.admin.v1.Index.parser(), extensionRegistry)); - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - nextPageToken_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - indexes_ = java.util.Collections.unmodifiableList(indexes_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.datastore.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_ListIndexesResponse_descriptor; @@ -268,7 +207,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -283,7 +222,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -301,7 +240,7 @@ public boolean equals(final java.lang.Object obj) { if (!getIndexesList().equals(other.getIndexesList())) return false; if (!getNextPageToken().equals(other.getNextPageToken())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -318,7 +257,7 @@ public int hashCode() { } hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER; hash = (53 * hash) + getNextPageToken().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -448,19 +387,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.ListIndexesResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getIndexesFieldBuilder(); - } } @java.lang.Override @@ -468,10 +398,11 @@ public Builder clear() { super.clear(); if (indexesBuilder_ == null) { indexes_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + indexes_ = null; indexesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; return this; @@ -593,7 +524,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.ListIndexesResponse other nextPageToken_ = other.nextPageToken_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -608,18 +539,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.ListIndexesResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.datastore.admin.v1.Index m = + input.readMessage( + com.google.datastore.admin.v1.Index.parser(), extensionRegistry); + if (indexesBuilder_ == null) { + ensureIndexesIsMutable(); + indexes_.add(m); + } else { + indexesBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + nextPageToken_ = input.readStringRequireUtf8(); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.ListIndexesResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1111,7 +1074,18 @@ public ListIndexesResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ListIndexesResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java index d2c8bb86e..1bca6fdec 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java @@ -54,101 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MigrationProgressEvent( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - step_ = rawValue; - break; - } - case 18: - { - com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.Builder - subBuilder = null; - if (stepDetailsCase_ == 2) { - subBuilder = - ((com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) - stepDetails_) - .toBuilder(); - } - stepDetails_ = - input.readMessage( - com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails - .parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) - stepDetails_); - stepDetails_ = subBuilder.buildPartial(); - } - stepDetailsCase_ = 2; - break; - } - case 26: - { - com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.Builder - subBuilder = null; - if (stepDetailsCase_ == 3) { - subBuilder = - ((com.google.datastore.admin.v1.MigrationProgressEvent - .RedirectWritesStepDetails) - stepDetails_) - .toBuilder(); - } - stepDetails_ = - input.readMessage( - com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails - .parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails) - stepDetails_); - stepDetails_ = subBuilder.buildPartial(); - } - stepDetailsCase_ = 3; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.MigrationProto .internal_static_google_datastore_admin_v1_MigrationProgressEvent_descriptor; @@ -415,52 +320,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PrepareStepDetails( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - concurrencyMode_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.MigrationProto .internal_static_google_datastore_admin_v1_MigrationProgressEvent_PrepareStepDetails_descriptor; @@ -541,7 +400,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io .getNumber()) { output.writeEnum(1, concurrencyMode_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -556,7 +415,7 @@ public int getSerializedSize() { .getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, concurrencyMode_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -574,7 +433,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) obj; if (concurrencyMode_ != other.concurrencyMode_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -587,7 +446,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + CONCURRENCY_MODE_FIELD_NUMBER; hash = (53 * hash) + concurrencyMode_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -722,17 +581,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -831,7 +683,7 @@ public Builder mergeFrom( if (other.concurrencyMode_ != 0) { setConcurrencyModeValue(other.getConcurrencyModeValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -846,20 +698,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails parsedMessage = - null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + concurrencyMode_ = input.readEnum(); + + break; + } // case 8 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.MigrationProgressEvent.PrepareStepDetails) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1010,7 +879,19 @@ public PrepareStepDetails parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PrepareStepDetails(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1097,52 +978,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RedirectWritesStepDetails( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - concurrencyMode_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.MigrationProto .internal_static_google_datastore_admin_v1_MigrationProgressEvent_RedirectWritesStepDetails_descriptor; @@ -1221,7 +1056,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io .getNumber()) { output.writeEnum(1, concurrencyMode_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1236,7 +1071,7 @@ public int getSerializedSize() { .getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, concurrencyMode_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1255,7 +1090,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails) obj; if (concurrencyMode_ != other.concurrencyMode_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1268,7 +1103,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + CONCURRENCY_MODE_FIELD_NUMBER; hash = (53 * hash) + concurrencyMode_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1410,17 +1245,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1523,7 +1351,7 @@ public Builder mergeFrom( if (other.concurrencyMode_ != 0) { setConcurrencyModeValue(other.getConcurrencyModeValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1538,20 +1366,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails - parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + concurrencyMode_ = input.readEnum(); + + break; + } // case 8 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1698,7 +1543,19 @@ public RedirectWritesStepDetails parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RedirectWritesStepDetails(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1958,7 +1815,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails) stepDetails_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1985,7 +1842,7 @@ public int getSerializedSize() { (com.google.datastore.admin.v1.MigrationProgressEvent.RedirectWritesStepDetails) stepDetails_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2014,7 +1871,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2039,7 +1896,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2170,17 +2027,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.MigrationProgressEvent.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -2188,6 +2038,12 @@ public Builder clear() { super.clear(); step_ = 0; + if (prepareStepDetailsBuilder_ != null) { + prepareStepDetailsBuilder_.clear(); + } + if (redirectWritesStepDetailsBuilder_ != null) { + redirectWritesStepDetailsBuilder_.clear(); + } stepDetailsCase_ = 0; stepDetails_ = null; return this; @@ -2302,7 +2158,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.MigrationProgressEvent ot break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2317,18 +2173,51 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.MigrationProgressEvent parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + step_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + input.readMessage( + getPrepareStepDetailsFieldBuilder().getBuilder(), extensionRegistry); + stepDetailsCase_ = 2; + break; + } // case 18 + case 26: + { + input.readMessage( + getRedirectWritesStepDetailsFieldBuilder().getBuilder(), extensionRegistry); + stepDetailsCase_ = 3; + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.MigrationProgressEvent) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2973,7 +2862,18 @@ public MigrationProgressEvent parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MigrationProgressEvent(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java index 95e77a6fd..af520c922 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationStateEvent.java @@ -54,52 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MigrationStateEvent( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - state_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.MigrationProto .internal_static_google_datastore_admin_v1_MigrationStateEvent_descriptor; @@ -169,7 +123,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io != com.google.datastore.admin.v1.MigrationState.MIGRATION_STATE_UNSPECIFIED.getNumber()) { output.writeEnum(1, state_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -182,7 +136,7 @@ public int getSerializedSize() { != com.google.datastore.admin.v1.MigrationState.MIGRATION_STATE_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, state_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -199,7 +153,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.datastore.admin.v1.MigrationStateEvent) obj; if (state_ != other.state_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -212,7 +166,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + STATE_FIELD_NUMBER; hash = (53 * hash) + state_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -343,17 +297,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.MigrationStateEvent.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -442,7 +389,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.MigrationStateEvent other if (other.state_ != 0) { setStateValue(other.getStateValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -457,18 +404,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.MigrationStateEvent parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + state_ = input.readEnum(); + + break; + } // case 8 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.admin.v1.MigrationStateEvent) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -595,7 +561,18 @@ public MigrationStateEvent parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MigrationStateEvent(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java index 2eeb86c5f..05e298a58 100644 --- a/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java +++ b/proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Progress.java @@ -50,55 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Progress( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - workCompleted_ = input.readInt64(); - break; - } - case 16: - { - workEstimated_ = input.readInt64(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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.admin.v1.DatastoreAdminProto .internal_static_google_datastore_admin_v1_Progress_descriptor; @@ -172,7 +123,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (workEstimated_ != 0L) { output.writeInt64(2, workEstimated_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -187,7 +138,7 @@ public int getSerializedSize() { if (workEstimated_ != 0L) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, workEstimated_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -204,7 +155,7 @@ public boolean equals(final java.lang.Object obj) { if (getWorkCompleted() != other.getWorkCompleted()) return false; if (getWorkEstimated() != other.getWorkEstimated()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -219,7 +170,7 @@ public int hashCode() { hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getWorkCompleted()); hash = (37 * hash) + WORK_ESTIMATED_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getWorkEstimated()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -348,17 +299,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.admin.v1.Progress.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -452,7 +396,7 @@ public Builder mergeFrom(com.google.datastore.admin.v1.Progress other) { if (other.getWorkEstimated() != 0L) { setWorkEstimated(other.getWorkEstimated()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -467,17 +411,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.admin.v1.Progress parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + workCompleted_ = input.readInt64(); + + break; + } // case 8 + case 16: + { + workEstimated_ = input.readInt64(); + + break; + } // case 16 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.admin.v1.Progress) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -623,7 +593,18 @@ public Progress parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Progress(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml index 771e05ed6..17edc539e 100644 --- a/proto-google-cloud-datastore-v1/pom.xml +++ b/proto-google-cloud-datastore-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datastore-v1 - 0.102.4 + 0.102.5 proto-google-cloud-datastore-v1 PROTO library for proto-google-cloud-datastore-v1 com.google.cloud google-cloud-datastore-parent - 2.11.4 + 2.11.5 diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java new file mode 100644 index 000000000..56ba0a35f --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java @@ -0,0 +1,3592 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +/** + * + * + * 
+ * Datastore query for running an aggregation over a [Query][google.datastore.v1.Query].
+ *
+ * + * Protobuf type {@code google.datastore.v1.AggregationQuery} + */ +public final class AggregationQuery extends com.google.protobuf.GeneratedMessageV3 + implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery) + AggregationQueryOrBuilder { + private static final long serialVersionUID = 0L; + // Use AggregationQuery.newBuilder() to construct. + private AggregationQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + + private AggregationQuery() { + aggregations_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new AggregationQuery(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + return this.unknownFields; + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AggregationQuery.class, + com.google.datastore.v1.AggregationQuery.Builder.class); + } + + public interface AggregationOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationQuery.Aggregation) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + * 
+     * Count aggregator.
+     *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + * + * @return Whether the count field is set. + */ + boolean hasCount(); + /** + * + * + * 
+     * Count aggregator.
+     *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + * + * @return The count. + */ + com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount(); + /** + * + * + * 
+     * Count aggregator.
+     *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + */ + com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCountOrBuilder(); + + /** + * + * + * 
+     * Optional. Optional name of the property to store the result of the aggregation.
+     * If not provided, Datastore will pick a default name following the format
+     * `property_<incremental_id++>`. For example:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2),
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4)
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * becomes:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2) AS property_1,
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4) AS property_2
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * Requires:
+     * * Must be unique across all aggregation aliases.
+     * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+     *
+ * + * string alias = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The alias. + */ + java.lang.String getAlias(); + /** + * + * + * 
+     * Optional. Optional name of the property to store the result of the aggregation.
+     * If not provided, Datastore will pick a default name following the format
+     * `property_<incremental_id++>`. For example:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2),
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4)
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * becomes:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2) AS property_1,
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4) AS property_2
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * Requires:
+     * * Must be unique across all aggregation aliases.
+     * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+     *
+ * + * string alias = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for alias. + */ + com.google.protobuf.ByteString getAliasBytes(); + + public com.google.datastore.v1.AggregationQuery.Aggregation.OperatorCase getOperatorCase(); + } + /** + * + * + * 
+   * Defines a aggregation that produces a single result.
+   *
+ * + * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation} + */ + public static final class Aggregation extends com.google.protobuf.GeneratedMessageV3 + implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation) + AggregationOrBuilder { + private static final long serialVersionUID = 0L; + // Use Aggregation.newBuilder() to construct. + private Aggregation(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + + private Aggregation() { + alias_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new Aggregation(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + return this.unknownFields; + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_Aggregation_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AggregationQuery.Aggregation.class, + com.google.datastore.v1.AggregationQuery.Aggregation.Builder.class); + } + + public interface CountOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationQuery.Aggregation.Count) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + * 
+       * Optional. Optional constraint on the maximum number of entities to count.
+       * This provides a way to set an upper bound on the number of entities
+       * to scan, limiting latency and cost.
+       * Unspecified is interpreted as no bound.
+       * If a zero value is provided, a count result of zero should always be
+       * expected.
+       * High-Level Example:
+       * ```
+       * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+       * ```
+       * Requires:
+       * * Must be non-negative when present.
+       *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return Whether the upTo field is set. + */ + boolean hasUpTo(); + /** + * + * + * 
+       * Optional. Optional constraint on the maximum number of entities to count.
+       * This provides a way to set an upper bound on the number of entities
+       * to scan, limiting latency and cost.
+       * Unspecified is interpreted as no bound.
+       * If a zero value is provided, a count result of zero should always be
+       * expected.
+       * High-Level Example:
+       * ```
+       * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+       * ```
+       * Requires:
+       * * Must be non-negative when present.
+       *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The upTo. + */ + com.google.protobuf.Int64Value getUpTo(); + /** + * + * + * 
+       * Optional. Optional constraint on the maximum number of entities to count.
+       * This provides a way to set an upper bound on the number of entities
+       * to scan, limiting latency and cost.
+       * Unspecified is interpreted as no bound.
+       * If a zero value is provided, a count result of zero should always be
+       * expected.
+       * High-Level Example:
+       * ```
+       * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+       * ```
+       * Requires:
+       * * Must be non-negative when present.
+       *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder(); + } + /** + * + * + * 
+     * Count of entities that match the query.
+     * The `COUNT(*)` aggregation function operates on the entire entity
+     * so it does not require a field reference.
+     *
+ * + * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation.Count} + */ + public static final class Count extends com.google.protobuf.GeneratedMessageV3 + implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationQuery.Aggregation.Count) + CountOrBuilder { + private static final long serialVersionUID = 0L; + // Use Count.newBuilder() to construct. + private Count(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + + private Count() {} + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new Count(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + return this.unknownFields; + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AggregationQuery.Aggregation.Count.class, + com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder.class); + } + + public static final int UP_TO_FIELD_NUMBER = 1; + private com.google.protobuf.Int64Value upTo_; + /** + * + * + * 
+       * Optional. Optional constraint on the maximum number of entities to count.
+       * This provides a way to set an upper bound on the number of entities
+       * to scan, limiting latency and cost.
+       * Unspecified is interpreted as no bound.
+       * If a zero value is provided, a count result of zero should always be
+       * expected.
+       * High-Level Example:
+       * ```
+       * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+       * ```
+       * Requires:
+       * * Must be non-negative when present.
+       *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return Whether the upTo field is set. + */ + @java.lang.Override + public boolean hasUpTo() { + return upTo_ != null; + } + /** + * + * + * 
+       * Optional. Optional constraint on the maximum number of entities to count.
+       * This provides a way to set an upper bound on the number of entities
+       * to scan, limiting latency and cost.
+       * Unspecified is interpreted as no bound.
+       * If a zero value is provided, a count result of zero should always be
+       * expected.
+       * High-Level Example:
+       * ```
+       * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+       * ```
+       * Requires:
+       * * Must be non-negative when present.
+       *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The upTo. + */ + @java.lang.Override + public com.google.protobuf.Int64Value getUpTo() { + return upTo_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : upTo_; + } + /** + * + * + * 
+       * Optional. Optional constraint on the maximum number of entities to count.
+       * This provides a way to set an upper bound on the number of entities
+       * to scan, limiting latency and cost.
+       * Unspecified is interpreted as no bound.
+       * If a zero value is provided, a count result of zero should always be
+       * expected.
+       * High-Level Example:
+       * ```
+       * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+       * ```
+       * Requires:
+       * * Must be non-negative when present.
+       *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder() { + return getUpTo(); + } + + private byte memoizedIsInitialized = -1; + + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (upTo_ != null) { + output.writeMessage(1, getUpTo()); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (upTo_ != null) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getUpTo()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.AggregationQuery.Aggregation.Count)) { + return super.equals(obj); + } + com.google.datastore.v1.AggregationQuery.Aggregation.Count other = + (com.google.datastore.v1.AggregationQuery.Aggregation.Count) obj; + + if (hasUpTo() != other.hasUpTo()) return false; + if (hasUpTo()) { + if (!getUpTo().equals(other.getUpTo())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasUpTo()) { + hash = (37 * hash) + UP_TO_FIELD_NUMBER; + hash = (53 * hash) + getUpTo().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom( + java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom( + 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.AggregationQuery.Aggregation.Count parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation.Count 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.AggregationQuery.Aggregation.Count parseFrom( + byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseDelimitedFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation.Count parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder( + com.google.datastore.v1.AggregationQuery.Aggregation.Count prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * + * + * 
+       * Count of entities that match the query.
+       * The `COUNT(*)` aggregation function operates on the entire entity
+       * so it does not require a field reference.
+       *
+ * + * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation.Count} + */ + public static final class Builder + extends com.google.protobuf.GeneratedMessageV3.Builder + implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationQuery.Aggregation.Count) + com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AggregationQuery.Aggregation.Count.class, + com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder.class); + } + + // Construct using com.google.datastore.v1.AggregationQuery.Aggregation.Count.newBuilder() + private Builder() {} + + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + } + + @java.lang.Override + public Builder clear() { + super.clear(); + if (upToBuilder_ == null) { + upTo_ = null; + } else { + upTo_ = null; + upToBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_descriptor; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation.Count + getDefaultInstanceForType() { + return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance(); + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation.Count build() { + com.google.datastore.v1.AggregationQuery.Aggregation.Count result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation.Count buildPartial() { + com.google.datastore.v1.AggregationQuery.Aggregation.Count result = + new com.google.datastore.v1.AggregationQuery.Aggregation.Count(this); + if (upToBuilder_ == null) { + result.upTo_ = upTo_; + } else { + result.upTo_ = upToBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + + @java.lang.Override + public Builder setField( + 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) { + return super.clearField(field); + } + + @java.lang.Override + 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) { + return super.setRepeatedField(field, index, value); + } + + @java.lang.Override + public Builder addRepeatedField( + 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.AggregationQuery.Aggregation.Count) { + return mergeFrom((com.google.datastore.v1.AggregationQuery.Aggregation.Count) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.AggregationQuery.Aggregation.Count other) { + if (other + == com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance()) + return this; + if (other.hasUpTo()) { + mergeUpTo(other.getUpTo()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getUpToFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private com.google.protobuf.Int64Value upTo_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Int64Value, + com.google.protobuf.Int64Value.Builder, + com.google.protobuf.Int64ValueOrBuilder> + upToBuilder_; + /** + * + * + * 
+         * Optional. Optional constraint on the maximum number of entities to count.
+         * This provides a way to set an upper bound on the number of entities
+         * to scan, limiting latency and cost.
+         * Unspecified is interpreted as no bound.
+         * If a zero value is provided, a count result of zero should always be
+         * expected.
+         * High-Level Example:
+         * ```
+         * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+         * ```
+         * Requires:
+         * * Must be non-negative when present.
+         *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return Whether the upTo field is set. + */ + public boolean hasUpTo() { + return upToBuilder_ != null || upTo_ != null; + } + /** + * + * + * 
+         * Optional. Optional constraint on the maximum number of entities to count.
+         * This provides a way to set an upper bound on the number of entities
+         * to scan, limiting latency and cost.
+         * Unspecified is interpreted as no bound.
+         * If a zero value is provided, a count result of zero should always be
+         * expected.
+         * High-Level Example:
+         * ```
+         * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+         * ```
+         * Requires:
+         * * Must be non-negative when present.
+         *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The upTo. + */ + public com.google.protobuf.Int64Value getUpTo() { + if (upToBuilder_ == null) { + return upTo_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : upTo_; + } else { + return upToBuilder_.getMessage(); + } + } + /** + * + * + * 
+         * Optional. Optional constraint on the maximum number of entities to count.
+         * This provides a way to set an upper bound on the number of entities
+         * to scan, limiting latency and cost.
+         * Unspecified is interpreted as no bound.
+         * If a zero value is provided, a count result of zero should always be
+         * expected.
+         * High-Level Example:
+         * ```
+         * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+         * ```
+         * Requires:
+         * * Must be non-negative when present.
+         *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder setUpTo(com.google.protobuf.Int64Value value) { + if (upToBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + upTo_ = value; + onChanged(); + } else { + upToBuilder_.setMessage(value); + } + + return this; + } + /** + * + * + * 
+         * Optional. Optional constraint on the maximum number of entities to count.
+         * This provides a way to set an upper bound on the number of entities
+         * to scan, limiting latency and cost.
+         * Unspecified is interpreted as no bound.
+         * If a zero value is provided, a count result of zero should always be
+         * expected.
+         * High-Level Example:
+         * ```
+         * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+         * ```
+         * Requires:
+         * * Must be non-negative when present.
+         *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder setUpTo(com.google.protobuf.Int64Value.Builder builderForValue) { + if (upToBuilder_ == null) { + upTo_ = builderForValue.build(); + onChanged(); + } else { + upToBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * + * + * 
+         * Optional. Optional constraint on the maximum number of entities to count.
+         * This provides a way to set an upper bound on the number of entities
+         * to scan, limiting latency and cost.
+         * Unspecified is interpreted as no bound.
+         * If a zero value is provided, a count result of zero should always be
+         * expected.
+         * High-Level Example:
+         * ```
+         * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+         * ```
+         * Requires:
+         * * Must be non-negative when present.
+         *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder mergeUpTo(com.google.protobuf.Int64Value value) { + if (upToBuilder_ == null) { + if (upTo_ != null) { + upTo_ = + com.google.protobuf.Int64Value.newBuilder(upTo_).mergeFrom(value).buildPartial(); + } else { + upTo_ = value; + } + onChanged(); + } else { + upToBuilder_.mergeFrom(value); + } + + return this; + } + /** + * + * + * 
+         * Optional. Optional constraint on the maximum number of entities to count.
+         * This provides a way to set an upper bound on the number of entities
+         * to scan, limiting latency and cost.
+         * Unspecified is interpreted as no bound.
+         * If a zero value is provided, a count result of zero should always be
+         * expected.
+         * High-Level Example:
+         * ```
+         * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+         * ```
+         * Requires:
+         * * Must be non-negative when present.
+         *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder clearUpTo() { + if (upToBuilder_ == null) { + upTo_ = null; + onChanged(); + } else { + upTo_ = null; + upToBuilder_ = null; + } + + return this; + } + /** + * + * + * 
+         * Optional. Optional constraint on the maximum number of entities to count.
+         * This provides a way to set an upper bound on the number of entities
+         * to scan, limiting latency and cost.
+         * Unspecified is interpreted as no bound.
+         * If a zero value is provided, a count result of zero should always be
+         * expected.
+         * High-Level Example:
+         * ```
+         * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+         * ```
+         * Requires:
+         * * Must be non-negative when present.
+         *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.protobuf.Int64Value.Builder getUpToBuilder() { + + onChanged(); + return getUpToFieldBuilder().getBuilder(); + } + /** + * + * + * 
+         * Optional. Optional constraint on the maximum number of entities to count.
+         * This provides a way to set an upper bound on the number of entities
+         * to scan, limiting latency and cost.
+         * Unspecified is interpreted as no bound.
+         * If a zero value is provided, a count result of zero should always be
+         * expected.
+         * High-Level Example:
+         * ```
+         * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+         * ```
+         * Requires:
+         * * Must be non-negative when present.
+         *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder() { + if (upToBuilder_ != null) { + return upToBuilder_.getMessageOrBuilder(); + } else { + return upTo_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : upTo_; + } + } + /** + * + * + * 
+         * Optional. Optional constraint on the maximum number of entities to count.
+         * This provides a way to set an upper bound on the number of entities
+         * to scan, limiting latency and cost.
+         * Unspecified is interpreted as no bound.
+         * If a zero value is provided, a count result of zero should always be
+         * expected.
+         * High-Level Example:
+         * ```
+         * AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k );
+         * ```
+         * Requires:
+         * * Must be non-negative when present.
+         *
+ * + * .google.protobuf.Int64Value up_to = 1 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Int64Value, + com.google.protobuf.Int64Value.Builder, + com.google.protobuf.Int64ValueOrBuilder> + getUpToFieldBuilder() { + if (upToBuilder_ == null) { + upToBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Int64Value, + com.google.protobuf.Int64Value.Builder, + com.google.protobuf.Int64ValueOrBuilder>( + getUpTo(), getParentForChildren(), isClean()); + upTo_ = null; + } + return upToBuilder_; + } + + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationQuery.Aggregation.Count) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationQuery.Aggregation.Count) + private static final com.google.datastore.v1.AggregationQuery.Aggregation.Count + DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationQuery.Aggregation.Count(); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation.Count + getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public Count parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation.Count + getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + } + + private int operatorCase_ = 0; + private java.lang.Object operator_; + + public enum OperatorCase + implements + com.google.protobuf.Internal.EnumLite, + com.google.protobuf.AbstractMessage.InternalOneOfEnum { + COUNT(1), + OPERATOR_NOT_SET(0); + private final int value; + + private OperatorCase(int value) { + this.value = value; + } + /** + * @param value The number of the enum to look for. + * @return The enum associated with the given number. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static OperatorCase valueOf(int value) { + return forNumber(value); + } + + public static OperatorCase forNumber(int value) { + switch (value) { + case 1: + return COUNT; + case 0: + return OPERATOR_NOT_SET; + default: + return null; + } + } + + public int getNumber() { + return this.value; + } + }; + + public OperatorCase getOperatorCase() { + return OperatorCase.forNumber(operatorCase_); + } + + public static final int COUNT_FIELD_NUMBER = 1; + /** + * + * + * 
+     * Count aggregator.
+     *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + * + * @return Whether the count field is set. + */ + @java.lang.Override + public boolean hasCount() { + return operatorCase_ == 1; + } + /** + * + * + * 
+     * Count aggregator.
+     *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + * + * @return The count. + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() { + if (operatorCase_ == 1) { + return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_; + } + return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance(); + } + /** + * + * + * 
+     * Count aggregator.
+     *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCountOrBuilder() { + if (operatorCase_ == 1) { + return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_; + } + return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance(); + } + + public static final int ALIAS_FIELD_NUMBER = 7; + private volatile java.lang.Object alias_; + /** + * + * + * 
+     * Optional. Optional name of the property to store the result of the aggregation.
+     * If not provided, Datastore will pick a default name following the format
+     * `property_<incremental_id++>`. For example:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2),
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4)
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * becomes:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2) AS property_1,
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4) AS property_2
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * Requires:
+     * * Must be unique across all aggregation aliases.
+     * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+     *
+ * + * string alias = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The alias. + */ + @java.lang.Override + public java.lang.String getAlias() { + java.lang.Object ref = alias_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + alias_ = s; + return s; + } + } + /** + * + * + * 
+     * Optional. Optional name of the property to store the result of the aggregation.
+     * If not provided, Datastore will pick a default name following the format
+     * `property_<incremental_id++>`. For example:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2),
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4)
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * becomes:
+     * ```
+     * AGGREGATE
+     *   COUNT_UP_TO(1) AS count_up_to_1,
+     *   COUNT_UP_TO(2) AS property_1,
+     *   COUNT_UP_TO(3) AS count_up_to_3,
+     *   COUNT_UP_TO(4) AS property_2
+     * OVER (
+     *   ...
+     * );
+     * ```
+     * Requires:
+     * * Must be unique across all aggregation aliases.
+     * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+     *
+ * + * string alias = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for alias. + */ + @java.lang.Override + public com.google.protobuf.ByteString getAliasBytes() { + java.lang.Object ref = alias_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + alias_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (operatorCase_ == 1) { + output.writeMessage( + 1, (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alias_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 7, alias_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (operatorCase_ == 1) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize( + 1, (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(alias_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, alias_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.AggregationQuery.Aggregation)) { + return super.equals(obj); + } + com.google.datastore.v1.AggregationQuery.Aggregation other = + (com.google.datastore.v1.AggregationQuery.Aggregation) obj; + + if (!getAlias().equals(other.getAlias())) return false; + if (!getOperatorCase().equals(other.getOperatorCase())) return false; + switch (operatorCase_) { + case 1: + if (!getCount().equals(other.getCount())) return false; + break; + case 0: + default: + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ALIAS_FIELD_NUMBER; + hash = (53 * hash) + getAlias().hashCode(); + switch (operatorCase_) { + case 1: + hash = (37 * hash) + COUNT_FIELD_NUMBER; + hash = (53 * hash) + getCount().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom( + java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom( + 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.AggregationQuery.Aggregation parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation 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.AggregationQuery.Aggregation parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation parseDelimitedFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder( + com.google.datastore.v1.AggregationQuery.Aggregation prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * + * + * 
+     * Defines a aggregation that produces a single result.
+     *
+ * + * Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation} + */ + public static final class Builder + extends com.google.protobuf.GeneratedMessageV3.Builder + implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationQuery.Aggregation) + com.google.datastore.v1.AggregationQuery.AggregationOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_Aggregation_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AggregationQuery.Aggregation.class, + com.google.datastore.v1.AggregationQuery.Aggregation.Builder.class); + } + + // Construct using com.google.datastore.v1.AggregationQuery.Aggregation.newBuilder() + private Builder() {} + + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + } + + @java.lang.Override + public Builder clear() { + super.clear(); + if (countBuilder_ != null) { + countBuilder_.clear(); + } + alias_ = ""; + + operatorCase_ = 0; + operator_ = null; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation getDefaultInstanceForType() { + return com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance(); + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation build() { + com.google.datastore.v1.AggregationQuery.Aggregation result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation buildPartial() { + com.google.datastore.v1.AggregationQuery.Aggregation result = + new com.google.datastore.v1.AggregationQuery.Aggregation(this); + if (operatorCase_ == 1) { + if (countBuilder_ == null) { + result.operator_ = operator_; + } else { + result.operator_ = countBuilder_.build(); + } + } + result.alias_ = alias_; + result.operatorCase_ = operatorCase_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + + @java.lang.Override + public Builder setField( + 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) { + return super.clearField(field); + } + + @java.lang.Override + 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) { + return super.setRepeatedField(field, index, value); + } + + @java.lang.Override + public Builder addRepeatedField( + 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.AggregationQuery.Aggregation) { + return mergeFrom((com.google.datastore.v1.AggregationQuery.Aggregation) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.AggregationQuery.Aggregation other) { + if (other == com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance()) + return this; + if (!other.getAlias().isEmpty()) { + alias_ = other.alias_; + onChanged(); + } + switch (other.getOperatorCase()) { + case COUNT: + { + mergeCount(other.getCount()); + break; + } + case OPERATOR_NOT_SET: + { + break; + } + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getCountFieldBuilder().getBuilder(), extensionRegistry); + operatorCase_ = 1; + break; + } // case 10 + case 58: + { + alias_ = input.readStringRequireUtf8(); + + break; + } // case 58 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private int operatorCase_ = 0; + private java.lang.Object operator_; + + public OperatorCase getOperatorCase() { + return OperatorCase.forNumber(operatorCase_); + } + + public Builder clearOperator() { + operatorCase_ = 0; + operator_ = null; + onChanged(); + return this; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationQuery.Aggregation.Count, + com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder, + com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder> + countBuilder_; + /** + * + * + * 
+       * Count aggregator.
+       *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + * + * @return Whether the count field is set. + */ + @java.lang.Override + public boolean hasCount() { + return operatorCase_ == 1; + } + /** + * + * + * 
+       * Count aggregator.
+       *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + * + * @return The count. + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation.Count getCount() { + if (countBuilder_ == null) { + if (operatorCase_ == 1) { + return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_; + } + return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance(); + } else { + if (operatorCase_ == 1) { + return countBuilder_.getMessage(); + } + return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance(); + } + } + /** + * + * + * 
+       * Count aggregator.
+       *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + */ + public Builder setCount(com.google.datastore.v1.AggregationQuery.Aggregation.Count value) { + if (countBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + operator_ = value; + onChanged(); + } else { + countBuilder_.setMessage(value); + } + operatorCase_ = 1; + return this; + } + /** + * + * + * 
+       * Count aggregator.
+       *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + */ + public Builder setCount( + com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder builderForValue) { + if (countBuilder_ == null) { + operator_ = builderForValue.build(); + onChanged(); + } else { + countBuilder_.setMessage(builderForValue.build()); + } + operatorCase_ = 1; + return this; + } + /** + * + * + * 
+       * Count aggregator.
+       *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + */ + public Builder mergeCount(com.google.datastore.v1.AggregationQuery.Aggregation.Count value) { + if (countBuilder_ == null) { + if (operatorCase_ == 1 + && operator_ + != com.google.datastore.v1.AggregationQuery.Aggregation.Count + .getDefaultInstance()) { + operator_ = + com.google.datastore.v1.AggregationQuery.Aggregation.Count.newBuilder( + (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_) + .mergeFrom(value) + .buildPartial(); + } else { + operator_ = value; + } + onChanged(); + } else { + if (operatorCase_ == 1) { + countBuilder_.mergeFrom(value); + } else { + countBuilder_.setMessage(value); + } + } + operatorCase_ = 1; + return this; + } + /** + * + * + * 
+       * Count aggregator.
+       *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + */ + public Builder clearCount() { + if (countBuilder_ == null) { + if (operatorCase_ == 1) { + operatorCase_ = 0; + operator_ = null; + onChanged(); + } + } else { + if (operatorCase_ == 1) { + operatorCase_ = 0; + operator_ = null; + } + countBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+       * Count aggregator.
+       *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + */ + public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCountBuilder() { + return getCountFieldBuilder().getBuilder(); + } + /** + * + * + * 
+       * Count aggregator.
+       *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder + getCountOrBuilder() { + if ((operatorCase_ == 1) && (countBuilder_ != null)) { + return countBuilder_.getMessageOrBuilder(); + } else { + if (operatorCase_ == 1) { + return (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_; + } + return com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance(); + } + } + /** + * + * + * 
+       * Count aggregator.
+       *
+ * + * .google.datastore.v1.AggregationQuery.Aggregation.Count count = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationQuery.Aggregation.Count, + com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder, + com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder> + getCountFieldBuilder() { + if (countBuilder_ == null) { + if (!(operatorCase_ == 1)) { + operator_ = + com.google.datastore.v1.AggregationQuery.Aggregation.Count.getDefaultInstance(); + } + countBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationQuery.Aggregation.Count, + com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder, + com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder>( + (com.google.datastore.v1.AggregationQuery.Aggregation.Count) operator_, + getParentForChildren(), + isClean()); + operator_ = null; + } + operatorCase_ = 1; + onChanged(); + ; + return countBuilder_; + } + + private java.lang.Object alias_ = ""; + /** + * + * + * 
+       * Optional. Optional name of the property to store the result of the aggregation.
+       * If not provided, Datastore will pick a default name following the format
+       * `property_<incremental_id++>`. For example:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2),
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4)
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * becomes:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2) AS property_1,
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4) AS property_2
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * Requires:
+       * * Must be unique across all aggregation aliases.
+       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       *
+ * + * string alias = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The alias. + */ + public java.lang.String getAlias() { + java.lang.Object ref = alias_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + alias_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + * 
+       * Optional. Optional name of the property to store the result of the aggregation.
+       * If not provided, Datastore will pick a default name following the format
+       * `property_<incremental_id++>`. For example:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2),
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4)
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * becomes:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2) AS property_1,
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4) AS property_2
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * Requires:
+       * * Must be unique across all aggregation aliases.
+       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       *
+ * + * string alias = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for alias. + */ + public com.google.protobuf.ByteString getAliasBytes() { + java.lang.Object ref = alias_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + alias_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + * 
+       * Optional. Optional name of the property to store the result of the aggregation.
+       * If not provided, Datastore will pick a default name following the format
+       * `property_<incremental_id++>`. For example:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2),
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4)
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * becomes:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2) AS property_1,
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4) AS property_2
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * Requires:
+       * * Must be unique across all aggregation aliases.
+       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       *
+ * + * string alias = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * @param value The alias to set. + * @return This builder for chaining. + */ + public Builder setAlias(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + alias_ = value; + onChanged(); + return this; + } + /** + * + * + * 
+       * Optional. Optional name of the property to store the result of the aggregation.
+       * If not provided, Datastore will pick a default name following the format
+       * `property_<incremental_id++>`. For example:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2),
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4)
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * becomes:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2) AS property_1,
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4) AS property_2
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * Requires:
+       * * Must be unique across all aggregation aliases.
+       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       *
+ * + * string alias = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return This builder for chaining. + */ + public Builder clearAlias() { + + alias_ = getDefaultInstance().getAlias(); + onChanged(); + return this; + } + /** + * + * + * 
+       * Optional. Optional name of the property to store the result of the aggregation.
+       * If not provided, Datastore will pick a default name following the format
+       * `property_<incremental_id++>`. For example:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2),
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4)
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * becomes:
+       * ```
+       * AGGREGATE
+       *   COUNT_UP_TO(1) AS count_up_to_1,
+       *   COUNT_UP_TO(2) AS property_1,
+       *   COUNT_UP_TO(3) AS count_up_to_3,
+       *   COUNT_UP_TO(4) AS property_2
+       * OVER (
+       *   ...
+       * );
+       * ```
+       * Requires:
+       * * Must be unique across all aggregation aliases.
+       * * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations.
+       *
+ * + * string alias = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * @param value The bytes for alias to set. + * @return This builder for chaining. + */ + public Builder setAliasBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + alias_ = value; + onChanged(); + return this; + } + + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationQuery.Aggregation) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationQuery.Aggregation) + private static final com.google.datastore.v1.AggregationQuery.Aggregation DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationQuery.Aggregation(); + } + + public static com.google.datastore.v1.AggregationQuery.Aggregation getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public Aggregation parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + } + + private int queryTypeCase_ = 0; + private java.lang.Object queryType_; + + public enum QueryTypeCase + implements + com.google.protobuf.Internal.EnumLite, + com.google.protobuf.AbstractMessage.InternalOneOfEnum { + NESTED_QUERY(1), + QUERYTYPE_NOT_SET(0); + private final int value; + + private QueryTypeCase(int value) { + this.value = value; + } + /** + * @param value The number of the enum to look for. + * @return The enum associated with the given number. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static QueryTypeCase valueOf(int value) { + return forNumber(value); + } + + public static QueryTypeCase forNumber(int value) { + switch (value) { + case 1: + return NESTED_QUERY; + case 0: + return QUERYTYPE_NOT_SET; + default: + return null; + } + } + + public int getNumber() { + return this.value; + } + }; + + public QueryTypeCase getQueryTypeCase() { + return QueryTypeCase.forNumber(queryTypeCase_); + } + + public static final int NESTED_QUERY_FIELD_NUMBER = 1; + /** + * + * + * 
+   * Nested query for aggregation
+   *
+ * + * .google.datastore.v1.Query nested_query = 1; + * + * @return Whether the nestedQuery field is set. + */ + @java.lang.Override + public boolean hasNestedQuery() { + return queryTypeCase_ == 1; + } + /** + * + * + * 
+   * Nested query for aggregation
+   *
+ * + * .google.datastore.v1.Query nested_query = 1; + * + * @return The nestedQuery. + */ + @java.lang.Override + public com.google.datastore.v1.Query getNestedQuery() { + if (queryTypeCase_ == 1) { + return (com.google.datastore.v1.Query) queryType_; + } + return com.google.datastore.v1.Query.getDefaultInstance(); + } + /** + * + * + * 
+   * Nested query for aggregation
+   *
+ * + * .google.datastore.v1.Query nested_query = 1; + */ + @java.lang.Override + public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() { + if (queryTypeCase_ == 1) { + return (com.google.datastore.v1.Query) queryType_; + } + return com.google.datastore.v1.Query.getDefaultInstance(); + } + + public static final int AGGREGATIONS_FIELD_NUMBER = 3; + private java.util.List aggregations_; + /** + * + * + * 
+   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * Requires:
+   * * A minimum of one and maximum of five aggregations per query.
+   *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public java.util.List + getAggregationsList() { + return aggregations_; + } + /** + * + * + * 
+   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * Requires:
+   * * A minimum of one and maximum of five aggregations per query.
+   *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public java.util.List + getAggregationsOrBuilderList() { + return aggregations_; + } + /** + * + * + * 
+   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * Requires:
+   * * A minimum of one and maximum of five aggregations per query.
+   *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public int getAggregationsCount() { + return aggregations_.size(); + } + /** + * + * + * 
+   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * Requires:
+   * * A minimum of one and maximum of five aggregations per query.
+   *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int index) { + return aggregations_.get(index); + } + /** + * + * + * 
+   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * Requires:
+   * * A minimum of one and maximum of five aggregations per query.
+   *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregationsOrBuilder( + int index) { + return aggregations_.get(index); + } + + private byte memoizedIsInitialized = -1; + + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (queryTypeCase_ == 1) { + output.writeMessage(1, (com.google.datastore.v1.Query) queryType_); + } + for (int i = 0; i < aggregations_.size(); i++) { + output.writeMessage(3, aggregations_.get(i)); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (queryTypeCase_ == 1) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize( + 1, (com.google.datastore.v1.Query) queryType_); + } + for (int i = 0; i < aggregations_.size(); i++) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, aggregations_.get(i)); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.AggregationQuery)) { + return super.equals(obj); + } + com.google.datastore.v1.AggregationQuery other = (com.google.datastore.v1.AggregationQuery) obj; + + if (!getAggregationsList().equals(other.getAggregationsList())) return false; + if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false; + switch (queryTypeCase_) { + case 1: + if (!getNestedQuery().equals(other.getNestedQuery())) return false; + break; + case 0: + default: + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getAggregationsCount() > 0) { + hash = (37 * hash) + AGGREGATIONS_FIELD_NUMBER; + hash = (53 * hash) + getAggregationsList().hashCode(); + } + switch (queryTypeCase_) { + case 1: + hash = (37 * hash) + NESTED_QUERY_FIELD_NUMBER; + hash = (53 * hash) + getNestedQuery().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.AggregationQuery parseFrom(java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationQuery parseFrom( + 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.AggregationQuery parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationQuery 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.AggregationQuery parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationQuery parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationQuery parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationQuery parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationQuery parseDelimitedFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationQuery parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationQuery parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationQuery parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(com.google.datastore.v1.AggregationQuery prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * + * + * 
+   * Datastore query for running an aggregation over a [Query][google.datastore.v1.Query].
+   *
+ * + * Protobuf type {@code google.datastore.v1.AggregationQuery} + */ + public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder + implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationQuery) + com.google.datastore.v1.AggregationQueryOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AggregationQuery.class, + com.google.datastore.v1.AggregationQuery.Builder.class); + } + + // Construct using com.google.datastore.v1.AggregationQuery.newBuilder() + private Builder() {} + + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + } + + @java.lang.Override + public Builder clear() { + super.clear(); + if (nestedQueryBuilder_ != null) { + nestedQueryBuilder_.clear(); + } + if (aggregationsBuilder_ == null) { + aggregations_ = java.util.Collections.emptyList(); + } else { + aggregations_ = null; + aggregationsBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + queryTypeCase_ = 0; + queryType_ = null; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.datastore.v1.QueryProto + .internal_static_google_datastore_v1_AggregationQuery_descriptor; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery getDefaultInstanceForType() { + return com.google.datastore.v1.AggregationQuery.getDefaultInstance(); + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery build() { + com.google.datastore.v1.AggregationQuery result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery buildPartial() { + com.google.datastore.v1.AggregationQuery result = + new com.google.datastore.v1.AggregationQuery(this); + int from_bitField0_ = bitField0_; + if (queryTypeCase_ == 1) { + if (nestedQueryBuilder_ == null) { + result.queryType_ = queryType_; + } else { + result.queryType_ = nestedQueryBuilder_.build(); + } + } + if (aggregationsBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + aggregations_ = java.util.Collections.unmodifiableList(aggregations_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.aggregations_ = aggregations_; + } else { + result.aggregations_ = aggregationsBuilder_.build(); + } + result.queryTypeCase_ = queryTypeCase_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + + @java.lang.Override + public Builder setField( + 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) { + return super.clearField(field); + } + + @java.lang.Override + 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) { + return super.setRepeatedField(field, index, value); + } + + @java.lang.Override + public Builder addRepeatedField( + 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.AggregationQuery) { + return mergeFrom((com.google.datastore.v1.AggregationQuery) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.AggregationQuery other) { + if (other == com.google.datastore.v1.AggregationQuery.getDefaultInstance()) return this; + if (aggregationsBuilder_ == null) { + if (!other.aggregations_.isEmpty()) { + if (aggregations_.isEmpty()) { + aggregations_ = other.aggregations_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureAggregationsIsMutable(); + aggregations_.addAll(other.aggregations_); + } + onChanged(); + } + } else { + if (!other.aggregations_.isEmpty()) { + if (aggregationsBuilder_.isEmpty()) { + aggregationsBuilder_.dispose(); + aggregationsBuilder_ = null; + aggregations_ = other.aggregations_; + bitField0_ = (bitField0_ & ~0x00000001); + aggregationsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders + ? getAggregationsFieldBuilder() + : null; + } else { + aggregationsBuilder_.addAllMessages(other.aggregations_); + } + } + } + switch (other.getQueryTypeCase()) { + case NESTED_QUERY: + { + mergeNestedQuery(other.getNestedQuery()); + break; + } + case QUERYTYPE_NOT_SET: + { + break; + } + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getNestedQueryFieldBuilder().getBuilder(), extensionRegistry); + queryTypeCase_ = 1; + break; + } // case 10 + case 26: + { + com.google.datastore.v1.AggregationQuery.Aggregation m = + input.readMessage( + com.google.datastore.v1.AggregationQuery.Aggregation.parser(), + extensionRegistry); + if (aggregationsBuilder_ == null) { + ensureAggregationsIsMutable(); + aggregations_.add(m); + } else { + aggregationsBuilder_.addMessage(m); + } + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private int queryTypeCase_ = 0; + private java.lang.Object queryType_; + + public QueryTypeCase getQueryTypeCase() { + return QueryTypeCase.forNumber(queryTypeCase_); + } + + public Builder clearQueryType() { + queryTypeCase_ = 0; + queryType_ = null; + onChanged(); + return this; + } + + private int bitField0_; + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Query, + com.google.datastore.v1.Query.Builder, + com.google.datastore.v1.QueryOrBuilder> + nestedQueryBuilder_; + /** + * + * + * 
+     * Nested query for aggregation
+     *
+ * + * .google.datastore.v1.Query nested_query = 1; + * + * @return Whether the nestedQuery field is set. + */ + @java.lang.Override + public boolean hasNestedQuery() { + return queryTypeCase_ == 1; + } + /** + * + * + * 
+     * Nested query for aggregation
+     *
+ * + * .google.datastore.v1.Query nested_query = 1; + * + * @return The nestedQuery. + */ + @java.lang.Override + public com.google.datastore.v1.Query getNestedQuery() { + if (nestedQueryBuilder_ == null) { + if (queryTypeCase_ == 1) { + return (com.google.datastore.v1.Query) queryType_; + } + return com.google.datastore.v1.Query.getDefaultInstance(); + } else { + if (queryTypeCase_ == 1) { + return nestedQueryBuilder_.getMessage(); + } + return com.google.datastore.v1.Query.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Nested query for aggregation
+     *
+ * + * .google.datastore.v1.Query nested_query = 1; + */ + public Builder setNestedQuery(com.google.datastore.v1.Query value) { + if (nestedQueryBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + queryType_ = value; + onChanged(); + } else { + nestedQueryBuilder_.setMessage(value); + } + queryTypeCase_ = 1; + return this; + } + /** + * + * + * 
+     * Nested query for aggregation
+     *
+ * + * .google.datastore.v1.Query nested_query = 1; + */ + public Builder setNestedQuery(com.google.datastore.v1.Query.Builder builderForValue) { + if (nestedQueryBuilder_ == null) { + queryType_ = builderForValue.build(); + onChanged(); + } else { + nestedQueryBuilder_.setMessage(builderForValue.build()); + } + queryTypeCase_ = 1; + return this; + } + /** + * + * + * 
+     * Nested query for aggregation
+     *
+ * + * .google.datastore.v1.Query nested_query = 1; + */ + public Builder mergeNestedQuery(com.google.datastore.v1.Query value) { + if (nestedQueryBuilder_ == null) { + if (queryTypeCase_ == 1 + && 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; + } + onChanged(); + } else { + if (queryTypeCase_ == 1) { + nestedQueryBuilder_.mergeFrom(value); + } else { + nestedQueryBuilder_.setMessage(value); + } + } + queryTypeCase_ = 1; + return this; + } + /** + * + * + * 
+     * Nested query for aggregation
+     *
+ * + * .google.datastore.v1.Query nested_query = 1; + */ + public Builder clearNestedQuery() { + if (nestedQueryBuilder_ == null) { + if (queryTypeCase_ == 1) { + queryTypeCase_ = 0; + queryType_ = null; + onChanged(); + } + } else { + if (queryTypeCase_ == 1) { + queryTypeCase_ = 0; + queryType_ = null; + } + nestedQueryBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * Nested query for aggregation
+     *
+ * + * .google.datastore.v1.Query nested_query = 1; + */ + public com.google.datastore.v1.Query.Builder getNestedQueryBuilder() { + return getNestedQueryFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Nested query for aggregation
+     *
+ * + * .google.datastore.v1.Query nested_query = 1; + */ + @java.lang.Override + public com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder() { + if ((queryTypeCase_ == 1) && (nestedQueryBuilder_ != null)) { + return nestedQueryBuilder_.getMessageOrBuilder(); + } else { + if (queryTypeCase_ == 1) { + return (com.google.datastore.v1.Query) queryType_; + } + return com.google.datastore.v1.Query.getDefaultInstance(); + } + } + /** + * + * + * 
+     * Nested query for aggregation
+     *
+ * + * .google.datastore.v1.Query nested_query = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.Query, + com.google.datastore.v1.Query.Builder, + com.google.datastore.v1.QueryOrBuilder> + getNestedQueryFieldBuilder() { + if (nestedQueryBuilder_ == null) { + if (!(queryTypeCase_ == 1)) { + queryType_ = com.google.datastore.v1.Query.getDefaultInstance(); + } + nestedQueryBuilder_ = + 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_ = 1; + onChanged(); + ; + return nestedQueryBuilder_; + } + + private java.util.List aggregations_ = + java.util.Collections.emptyList(); + + private void ensureAggregationsIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + aggregations_ = + new java.util.ArrayList( + aggregations_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.AggregationQuery.Aggregation, + com.google.datastore.v1.AggregationQuery.Aggregation.Builder, + com.google.datastore.v1.AggregationQuery.AggregationOrBuilder> + aggregationsBuilder_; + + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public java.util.List + getAggregationsList() { + if (aggregationsBuilder_ == null) { + return java.util.Collections.unmodifiableList(aggregations_); + } else { + return aggregationsBuilder_.getMessageList(); + } + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public int getAggregationsCount() { + if (aggregationsBuilder_ == null) { + return aggregations_.size(); + } else { + return aggregationsBuilder_.getCount(); + } + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int index) { + if (aggregationsBuilder_ == null) { + return aggregations_.get(index); + } else { + return aggregationsBuilder_.getMessage(index); + } + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder setAggregations( + int index, com.google.datastore.v1.AggregationQuery.Aggregation value) { + if (aggregationsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureAggregationsIsMutable(); + aggregations_.set(index, value); + onChanged(); + } else { + aggregationsBuilder_.setMessage(index, value); + } + return this; + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder setAggregations( + int index, com.google.datastore.v1.AggregationQuery.Aggregation.Builder builderForValue) { + if (aggregationsBuilder_ == null) { + ensureAggregationsIsMutable(); + aggregations_.set(index, builderForValue.build()); + onChanged(); + } else { + aggregationsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder addAggregations(com.google.datastore.v1.AggregationQuery.Aggregation value) { + if (aggregationsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureAggregationsIsMutable(); + aggregations_.add(value); + onChanged(); + } else { + aggregationsBuilder_.addMessage(value); + } + return this; + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder addAggregations( + int index, com.google.datastore.v1.AggregationQuery.Aggregation value) { + if (aggregationsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureAggregationsIsMutable(); + aggregations_.add(index, value); + onChanged(); + } else { + aggregationsBuilder_.addMessage(index, value); + } + return this; + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder addAggregations( + com.google.datastore.v1.AggregationQuery.Aggregation.Builder builderForValue) { + if (aggregationsBuilder_ == null) { + ensureAggregationsIsMutable(); + aggregations_.add(builderForValue.build()); + onChanged(); + } else { + aggregationsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder addAggregations( + int index, com.google.datastore.v1.AggregationQuery.Aggregation.Builder builderForValue) { + if (aggregationsBuilder_ == null) { + ensureAggregationsIsMutable(); + aggregations_.add(index, builderForValue.build()); + onChanged(); + } else { + aggregationsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder addAllAggregations( + java.lang.Iterable values) { + if (aggregationsBuilder_ == null) { + ensureAggregationsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll(values, aggregations_); + onChanged(); + } else { + aggregationsBuilder_.addAllMessages(values); + } + return this; + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder clearAggregations() { + if (aggregationsBuilder_ == null) { + aggregations_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + aggregationsBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public Builder removeAggregations(int index) { + if (aggregationsBuilder_ == null) { + ensureAggregationsIsMutable(); + aggregations_.remove(index); + onChanged(); + } else { + aggregationsBuilder_.remove(index); + } + return this; + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.AggregationQuery.Aggregation.Builder getAggregationsBuilder( + int index) { + return getAggregationsFieldBuilder().getBuilder(index); + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregationsOrBuilder( + int index) { + if (aggregationsBuilder_ == null) { + return aggregations_.get(index); + } else { + return aggregationsBuilder_.getMessageOrBuilder(index); + } + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public java.util.List + getAggregationsOrBuilderList() { + if (aggregationsBuilder_ != null) { + return aggregationsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(aggregations_); + } + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregationsBuilder() { + return getAggregationsFieldBuilder() + .addBuilder(com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance()); + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public com.google.datastore.v1.AggregationQuery.Aggregation.Builder addAggregationsBuilder( + int index) { + return getAggregationsFieldBuilder() + .addBuilder( + index, com.google.datastore.v1.AggregationQuery.Aggregation.getDefaultInstance()); + } + /** + * + * + * 
+     * Optional. Series of aggregations to apply over the results of the `nested_query`.
+     * Requires:
+     * * A minimum of one and maximum of five aggregations per query.
+     *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + public java.util.List + getAggregationsBuilderList() { + return getAggregationsFieldBuilder().getBuilderList(); + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.AggregationQuery.Aggregation, + com.google.datastore.v1.AggregationQuery.Aggregation.Builder, + com.google.datastore.v1.AggregationQuery.AggregationOrBuilder> + getAggregationsFieldBuilder() { + if (aggregationsBuilder_ == null) { + aggregationsBuilder_ = + new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.AggregationQuery.Aggregation, + com.google.datastore.v1.AggregationQuery.Aggregation.Builder, + com.google.datastore.v1.AggregationQuery.AggregationOrBuilder>( + aggregations_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + aggregations_ = null; + } + return aggregationsBuilder_; + } + + @java.lang.Override + public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationQuery) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationQuery) + private static final com.google.datastore.v1.AggregationQuery DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationQuery(); + } + + public static com.google.datastore.v1.AggregationQuery getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public AggregationQuery parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationQuery getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java new file mode 100644 index 000000000..457f963e9 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQueryOrBuilder.java @@ -0,0 +1,134 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/query.proto + +package com.google.datastore.v1; + +public interface AggregationQueryOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationQuery) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + * 
+   * Nested query for aggregation
+   *
+ * + * .google.datastore.v1.Query nested_query = 1; + * + * @return Whether the nestedQuery field is set. + */ + boolean hasNestedQuery(); + /** + * + * + * 
+   * Nested query for aggregation
+   *
+ * + * .google.datastore.v1.Query nested_query = 1; + * + * @return The nestedQuery. + */ + com.google.datastore.v1.Query getNestedQuery(); + /** + * + * + * 
+   * Nested query for aggregation
+   *
+ * + * .google.datastore.v1.Query nested_query = 1; + */ + com.google.datastore.v1.QueryOrBuilder getNestedQueryOrBuilder(); + + /** + * + * + * 
+   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * Requires:
+   * * A minimum of one and maximum of five aggregations per query.
+   *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + java.util.List getAggregationsList(); + /** + * + * + * 
+   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * Requires:
+   * * A minimum of one and maximum of five aggregations per query.
+   *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + com.google.datastore.v1.AggregationQuery.Aggregation getAggregations(int index); + /** + * + * + * 
+   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * Requires:
+   * * A minimum of one and maximum of five aggregations per query.
+   *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + int getAggregationsCount(); + /** + * + * + * 
+   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * Requires:
+   * * A minimum of one and maximum of five aggregations per query.
+   *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + java.util.List + getAggregationsOrBuilderList(); + /** + * + * + * 
+   * Optional. Series of aggregations to apply over the results of the `nested_query`.
+   * Requires:
+   * * A minimum of one and maximum of five aggregations per query.
+   *
+ * + * + * repeated .google.datastore.v1.AggregationQuery.Aggregation aggregations = 3 [(.google.api.field_behavior) = OPTIONAL]; + * + */ + com.google.datastore.v1.AggregationQuery.AggregationOrBuilder getAggregationsOrBuilder(int index); + + public com.google.datastore.v1.AggregationQuery.QueryTypeCase getQueryTypeCase(); +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java new file mode 100644 index 000000000..9d3276499 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResult.java @@ -0,0 +1,822 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/aggregation_result.proto + +package com.google.datastore.v1; + +/** + * + * + * 
+ * The result of a single bucket from a Datastore aggregation query.
+ * The keys of `aggregate_properties` are the same for all results in an
+ * aggregation query, unlike entity queries which can have different fields
+ * present for each result.
+ *
+ * + * Protobuf type {@code google.datastore.v1.AggregationResult} + */ +public final class AggregationResult extends com.google.protobuf.GeneratedMessageV3 + implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationResult) + AggregationResultOrBuilder { + private static final long serialVersionUID = 0L; + // Use AggregationResult.newBuilder() to construct. + private AggregationResult(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + + private AggregationResult() {} + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new AggregationResult(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + return this.unknownFields; + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.AggregationResultProto + .internal_static_google_datastore_v1_AggregationResult_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + @java.lang.Override + protected com.google.protobuf.MapField internalGetMapField(int number) { + switch (number) { + case 2: + return internalGetAggregateProperties(); + default: + throw new RuntimeException("Invalid map field number: " + number); + } + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.AggregationResultProto + .internal_static_google_datastore_v1_AggregationResult_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AggregationResult.class, + com.google.datastore.v1.AggregationResult.Builder.class); + } + + public static final int AGGREGATE_PROPERTIES_FIELD_NUMBER = 2; + + private static final class AggregatePropertiesDefaultEntryHolder { + static final com.google.protobuf.MapEntry + defaultEntry = + com.google.protobuf.MapEntry + .newDefaultInstance( + com.google.datastore.v1.AggregationResultProto + .internal_static_google_datastore_v1_AggregationResult_AggregatePropertiesEntry_descriptor, + com.google.protobuf.WireFormat.FieldType.STRING, + "", + com.google.protobuf.WireFormat.FieldType.MESSAGE, + com.google.datastore.v1.Value.getDefaultInstance()); + } + + private com.google.protobuf.MapField + aggregateProperties_; + + private com.google.protobuf.MapField + internalGetAggregateProperties() { + if (aggregateProperties_ == null) { + return com.google.protobuf.MapField.emptyMapField( + AggregatePropertiesDefaultEntryHolder.defaultEntry); + } + return aggregateProperties_; + } + + public int getAggregatePropertiesCount() { + return internalGetAggregateProperties().getMap().size(); + } + /** + * + * + * 
+   * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+   * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+   * assigned to the aggregation function on input and the size of this map
+   * equals the number of aggregation functions in the query.
+   *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + @java.lang.Override + public boolean containsAggregateProperties(java.lang.String key) { + if (key == null) { + throw new NullPointerException("map key"); + } + return internalGetAggregateProperties().getMap().containsKey(key); + } + /** Use {@link #getAggregatePropertiesMap()} instead. */ + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getAggregateProperties() { + return getAggregatePropertiesMap(); + } + /** + * + * + * 
+   * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+   * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+   * assigned to the aggregation function on input and the size of this map
+   * equals the number of aggregation functions in the query.
+   *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + @java.lang.Override + public java.util.Map + getAggregatePropertiesMap() { + return internalGetAggregateProperties().getMap(); + } + /** + * + * + * 
+   * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+   * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+   * assigned to the aggregation function on input and the size of this map
+   * equals the number of aggregation functions in the query.
+   *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + @java.lang.Override + public com.google.datastore.v1.Value getAggregatePropertiesOrDefault( + java.lang.String key, com.google.datastore.v1.Value defaultValue) { + if (key == null) { + throw new NullPointerException("map key"); + } + java.util.Map map = + internalGetAggregateProperties().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * + * + * 
+   * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+   * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+   * assigned to the aggregation function on input and the size of this map
+   * equals the number of aggregation functions in the query.
+   *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + @java.lang.Override + public com.google.datastore.v1.Value getAggregatePropertiesOrThrow(java.lang.String key) { + if (key == null) { + throw new NullPointerException("map key"); + } + java.util.Map map = + internalGetAggregateProperties().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + private byte memoizedIsInitialized = -1; + + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( + output, + internalGetAggregateProperties(), + AggregatePropertiesDefaultEntryHolder.defaultEntry, + 2); + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (java.util.Map.Entry entry : + internalGetAggregateProperties().getMap().entrySet()) { + com.google.protobuf.MapEntry + aggregateProperties__ = + AggregatePropertiesDefaultEntryHolder.defaultEntry + .newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); + size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, aggregateProperties__); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.AggregationResult)) { + return super.equals(obj); + } + com.google.datastore.v1.AggregationResult other = + (com.google.datastore.v1.AggregationResult) obj; + + if (!internalGetAggregateProperties().equals(other.internalGetAggregateProperties())) + return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (!internalGetAggregateProperties().getMap().isEmpty()) { + hash = (37 * hash) + AGGREGATE_PROPERTIES_FIELD_NUMBER; + hash = (53 * hash) + internalGetAggregateProperties().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.AggregationResult parseFrom(java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationResult parseFrom( + 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.AggregationResult parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationResult 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.AggregationResult parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationResult parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationResult parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationResult parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationResult parseDelimitedFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationResult parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationResult parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationResult parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(com.google.datastore.v1.AggregationResult prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * + * + * 
+   * The result of a single bucket from a Datastore aggregation query.
+   * The keys of `aggregate_properties` are the same for all results in an
+   * aggregation query, unlike entity queries which can have different fields
+   * present for each result.
+   *
+ * + * Protobuf type {@code google.datastore.v1.AggregationResult} + */ + public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder + implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationResult) + com.google.datastore.v1.AggregationResultOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.AggregationResultProto + .internal_static_google_datastore_v1_AggregationResult_descriptor; + } + + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMapField(int number) { + switch (number) { + case 2: + return internalGetAggregateProperties(); + default: + throw new RuntimeException("Invalid map field number: " + number); + } + } + + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMutableMapField(int number) { + switch (number) { + case 2: + return internalGetMutableAggregateProperties(); + default: + throw new RuntimeException("Invalid map field number: " + number); + } + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.AggregationResultProto + .internal_static_google_datastore_v1_AggregationResult_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AggregationResult.class, + com.google.datastore.v1.AggregationResult.Builder.class); + } + + // Construct using com.google.datastore.v1.AggregationResult.newBuilder() + private Builder() {} + + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + } + + @java.lang.Override + public Builder clear() { + super.clear(); + internalGetMutableAggregateProperties().clear(); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.datastore.v1.AggregationResultProto + .internal_static_google_datastore_v1_AggregationResult_descriptor; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationResult getDefaultInstanceForType() { + return com.google.datastore.v1.AggregationResult.getDefaultInstance(); + } + + @java.lang.Override + public com.google.datastore.v1.AggregationResult build() { + com.google.datastore.v1.AggregationResult result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationResult buildPartial() { + com.google.datastore.v1.AggregationResult result = + new com.google.datastore.v1.AggregationResult(this); + int from_bitField0_ = bitField0_; + result.aggregateProperties_ = internalGetAggregateProperties(); + result.aggregateProperties_.makeImmutable(); + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + + @java.lang.Override + public Builder setField( + 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) { + return super.clearField(field); + } + + @java.lang.Override + 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) { + return super.setRepeatedField(field, index, value); + } + + @java.lang.Override + public Builder addRepeatedField( + 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.AggregationResult) { + return mergeFrom((com.google.datastore.v1.AggregationResult) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.AggregationResult other) { + if (other == com.google.datastore.v1.AggregationResult.getDefaultInstance()) return this; + internalGetMutableAggregateProperties().mergeFrom(other.internalGetAggregateProperties()); + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 18: + { + com.google.protobuf.MapEntry + aggregateProperties__ = + input.readMessage( + AggregatePropertiesDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableAggregateProperties() + .getMutableMap() + .put(aggregateProperties__.getKey(), aggregateProperties__.getValue()); + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private int bitField0_; + + private com.google.protobuf.MapField + aggregateProperties_; + + private com.google.protobuf.MapField + internalGetAggregateProperties() { + if (aggregateProperties_ == null) { + return com.google.protobuf.MapField.emptyMapField( + AggregatePropertiesDefaultEntryHolder.defaultEntry); + } + return aggregateProperties_; + } + + private com.google.protobuf.MapField + internalGetMutableAggregateProperties() { + onChanged(); + ; + if (aggregateProperties_ == null) { + aggregateProperties_ = + com.google.protobuf.MapField.newMapField( + AggregatePropertiesDefaultEntryHolder.defaultEntry); + } + if (!aggregateProperties_.isMutable()) { + aggregateProperties_ = aggregateProperties_.copy(); + } + return aggregateProperties_; + } + + public int getAggregatePropertiesCount() { + return internalGetAggregateProperties().getMap().size(); + } + /** + * + * + * 
+     * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+     * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+     * assigned to the aggregation function on input and the size of this map
+     * equals the number of aggregation functions in the query.
+     *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + @java.lang.Override + public boolean containsAggregateProperties(java.lang.String key) { + if (key == null) { + throw new NullPointerException("map key"); + } + return internalGetAggregateProperties().getMap().containsKey(key); + } + /** Use {@link #getAggregatePropertiesMap()} instead. */ + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getAggregateProperties() { + return getAggregatePropertiesMap(); + } + /** + * + * + * 
+     * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+     * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+     * assigned to the aggregation function on input and the size of this map
+     * equals the number of aggregation functions in the query.
+     *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + @java.lang.Override + public java.util.Map + getAggregatePropertiesMap() { + return internalGetAggregateProperties().getMap(); + } + /** + * + * + * 
+     * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+     * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+     * assigned to the aggregation function on input and the size of this map
+     * equals the number of aggregation functions in the query.
+     *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + @java.lang.Override + public com.google.datastore.v1.Value getAggregatePropertiesOrDefault( + java.lang.String key, com.google.datastore.v1.Value defaultValue) { + if (key == null) { + throw new NullPointerException("map key"); + } + java.util.Map map = + internalGetAggregateProperties().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * + * + * 
+     * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+     * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+     * assigned to the aggregation function on input and the size of this map
+     * equals the number of aggregation functions in the query.
+     *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + @java.lang.Override + public com.google.datastore.v1.Value getAggregatePropertiesOrThrow(java.lang.String key) { + if (key == null) { + throw new NullPointerException("map key"); + } + java.util.Map map = + internalGetAggregateProperties().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public Builder clearAggregateProperties() { + internalGetMutableAggregateProperties().getMutableMap().clear(); + return this; + } + /** + * + * + * 
+     * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+     * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+     * assigned to the aggregation function on input and the size of this map
+     * equals the number of aggregation functions in the query.
+     *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + public Builder removeAggregateProperties(java.lang.String key) { + if (key == null) { + throw new NullPointerException("map key"); + } + internalGetMutableAggregateProperties().getMutableMap().remove(key); + return this; + } + /** Use alternate mutation accessors instead. */ + @java.lang.Deprecated + public java.util.Map + getMutableAggregateProperties() { + return internalGetMutableAggregateProperties().getMutableMap(); + } + /** + * + * + * 
+     * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+     * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+     * assigned to the aggregation function on input and the size of this map
+     * equals the number of aggregation functions in the query.
+     *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + public Builder putAggregateProperties( + java.lang.String key, com.google.datastore.v1.Value value) { + if (key == null) { + throw new NullPointerException("map key"); + } + if (value == null) { + throw new NullPointerException("map value"); + } + + internalGetMutableAggregateProperties().getMutableMap().put(key, value); + return this; + } + /** + * + * + * 
+     * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+     * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+     * assigned to the aggregation function on input and the size of this map
+     * equals the number of aggregation functions in the query.
+     *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + public Builder putAllAggregateProperties( + java.util.Map values) { + internalGetMutableAggregateProperties().getMutableMap().putAll(values); + return this; + } + + @java.lang.Override + public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationResult) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationResult) + private static final com.google.datastore.v1.AggregationResult DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationResult(); + } + + public static com.google.datastore.v1.AggregationResult getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public AggregationResult parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationResult getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java new file mode 100644 index 000000000..c603e515f --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatch.java @@ -0,0 +1,1403 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/aggregation_result.proto + +package com.google.datastore.v1; + +/** + * + * + * 
+ * A batch of aggregation results produced by an aggregation query.
+ *
+ * + * Protobuf type {@code google.datastore.v1.AggregationResultBatch} + */ +public final class AggregationResultBatch extends com.google.protobuf.GeneratedMessageV3 + implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.AggregationResultBatch) + AggregationResultBatchOrBuilder { + private static final long serialVersionUID = 0L; + // Use AggregationResultBatch.newBuilder() to construct. + private AggregationResultBatch(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + + private AggregationResultBatch() { + aggregationResults_ = java.util.Collections.emptyList(); + moreResults_ = 0; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new AggregationResultBatch(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + return this.unknownFields; + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.AggregationResultProto + .internal_static_google_datastore_v1_AggregationResultBatch_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.AggregationResultProto + .internal_static_google_datastore_v1_AggregationResultBatch_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AggregationResultBatch.class, + com.google.datastore.v1.AggregationResultBatch.Builder.class); + } + + public static final int AGGREGATION_RESULTS_FIELD_NUMBER = 1; + private java.util.List aggregationResults_; + /** + * + * + * 
+   * The aggregation results for this batch.
+   *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + @java.lang.Override + public java.util.List getAggregationResultsList() { + return aggregationResults_; + } + /** + * + * + * 
+   * The aggregation results for this batch.
+   *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + @java.lang.Override + public java.util.List + getAggregationResultsOrBuilderList() { + return aggregationResults_; + } + /** + * + * + * 
+   * The aggregation results for this batch.
+   *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + @java.lang.Override + public int getAggregationResultsCount() { + return aggregationResults_.size(); + } + /** + * + * + * 
+   * The aggregation results for this batch.
+   *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + @java.lang.Override + public com.google.datastore.v1.AggregationResult getAggregationResults(int index) { + return aggregationResults_.get(index); + } + /** + * + * + * 
+   * The aggregation results for this batch.
+   *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + @java.lang.Override + public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsOrBuilder( + int index) { + return aggregationResults_.get(index); + } + + public static final int MORE_RESULTS_FIELD_NUMBER = 2; + private int moreResults_; + /** + * + * + * 
+   * The state of the query after the current batch.
+   * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+   * expected result type is limited to `NO_MORE_RESULTS`.
+   *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2; + * + * @return The enum numeric value on the wire for moreResults. + */ + @java.lang.Override + public int getMoreResultsValue() { + return moreResults_; + } + /** + * + * + * 
+   * The state of the query after the current batch.
+   * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+   * expected result type is limited to `NO_MORE_RESULTS`.
+   *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2; + * + * @return The moreResults. + */ + @java.lang.Override + 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; + } + + public static final int READ_TIME_FIELD_NUMBER = 3; + private com.google.protobuf.Timestamp readTime_; + /** + * + * + * 
+   * Read timestamp this batch was returned from.
+   * In a single transaction, subsequent query result batches for the same query
+   * can have a greater timestamp. Each batch's read timestamp
+   * is valid for all preceding batches.
+   *
+ * + * .google.protobuf.Timestamp read_time = 3; + * + * @return Whether the readTime field is set. + */ + @java.lang.Override + public boolean hasReadTime() { + return readTime_ != null; + } + /** + * + * + * 
+   * Read timestamp this batch was returned from.
+   * In a single transaction, subsequent query result batches for the same query
+   * can have a greater timestamp. Each batch's read timestamp
+   * is valid for all preceding batches.
+   *
+ * + * .google.protobuf.Timestamp read_time = 3; + * + * @return The readTime. + */ + @java.lang.Override + public com.google.protobuf.Timestamp getReadTime() { + return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_; + } + /** + * + * + * 
+   * Read timestamp this batch was returned from.
+   * In a single transaction, subsequent query result batches for the same query
+   * can have a greater timestamp. Each batch's read timestamp
+   * is valid for all preceding batches.
+   *
+ * + * .google.protobuf.Timestamp read_time = 3; + */ + @java.lang.Override + public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { + return getReadTime(); + } + + private byte memoizedIsInitialized = -1; + + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + for (int i = 0; i < aggregationResults_.size(); i++) { + output.writeMessage(1, aggregationResults_.get(i)); + } + if (moreResults_ + != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED + .getNumber()) { + output.writeEnum(2, moreResults_); + } + if (readTime_ != null) { + output.writeMessage(3, getReadTime()); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < aggregationResults_.size(); i++) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize(1, aggregationResults_.get(i)); + } + if (moreResults_ + != com.google.datastore.v1.QueryResultBatch.MoreResultsType.MORE_RESULTS_TYPE_UNSPECIFIED + .getNumber()) { + size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, moreResults_); + } + if (readTime_ != null) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getReadTime()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.AggregationResultBatch)) { + return super.equals(obj); + } + com.google.datastore.v1.AggregationResultBatch other = + (com.google.datastore.v1.AggregationResultBatch) obj; + + if (!getAggregationResultsList().equals(other.getAggregationResultsList())) return false; + if (moreResults_ != other.moreResults_) return false; + if (hasReadTime() != other.hasReadTime()) return false; + if (hasReadTime()) { + if (!getReadTime().equals(other.getReadTime())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getAggregationResultsCount() > 0) { + hash = (37 * hash) + AGGREGATION_RESULTS_FIELD_NUMBER; + hash = (53 * hash) + getAggregationResultsList().hashCode(); + } + hash = (37 * hash) + MORE_RESULTS_FIELD_NUMBER; + hash = (53 * hash) + moreResults_; + if (hasReadTime()) { + hash = (37 * hash) + READ_TIME_FIELD_NUMBER; + hash = (53 * hash) + getReadTime().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.AggregationResultBatch parseFrom(java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationResultBatch parseFrom( + 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.AggregationResultBatch parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationResultBatch 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.AggregationResultBatch parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.AggregationResultBatch parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationResultBatch parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationResultBatch parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationResultBatch parseDelimitedFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationResultBatch parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.AggregationResultBatch parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.AggregationResultBatch parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(com.google.datastore.v1.AggregationResultBatch prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * + * + * 
+   * A batch of aggregation results produced by an aggregation query.
+   *
+ * + * Protobuf type {@code google.datastore.v1.AggregationResultBatch} + */ + public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder + implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.AggregationResultBatch) + com.google.datastore.v1.AggregationResultBatchOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.AggregationResultProto + .internal_static_google_datastore_v1_AggregationResultBatch_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.AggregationResultProto + .internal_static_google_datastore_v1_AggregationResultBatch_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.AggregationResultBatch.class, + com.google.datastore.v1.AggregationResultBatch.Builder.class); + } + + // Construct using com.google.datastore.v1.AggregationResultBatch.newBuilder() + private Builder() {} + + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + } + + @java.lang.Override + public Builder clear() { + super.clear(); + if (aggregationResultsBuilder_ == null) { + aggregationResults_ = java.util.Collections.emptyList(); + } else { + aggregationResults_ = null; + aggregationResultsBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + moreResults_ = 0; + + if (readTimeBuilder_ == null) { + readTime_ = null; + } else { + readTime_ = null; + readTimeBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.datastore.v1.AggregationResultProto + .internal_static_google_datastore_v1_AggregationResultBatch_descriptor; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationResultBatch getDefaultInstanceForType() { + return com.google.datastore.v1.AggregationResultBatch.getDefaultInstance(); + } + + @java.lang.Override + public com.google.datastore.v1.AggregationResultBatch build() { + com.google.datastore.v1.AggregationResultBatch result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationResultBatch buildPartial() { + com.google.datastore.v1.AggregationResultBatch result = + new com.google.datastore.v1.AggregationResultBatch(this); + int from_bitField0_ = bitField0_; + if (aggregationResultsBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + aggregationResults_ = java.util.Collections.unmodifiableList(aggregationResults_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.aggregationResults_ = aggregationResults_; + } else { + result.aggregationResults_ = aggregationResultsBuilder_.build(); + } + result.moreResults_ = moreResults_; + if (readTimeBuilder_ == null) { + result.readTime_ = readTime_; + } else { + result.readTime_ = readTimeBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + + @java.lang.Override + public Builder setField( + 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) { + return super.clearField(field); + } + + @java.lang.Override + 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) { + return super.setRepeatedField(field, index, value); + } + + @java.lang.Override + public Builder addRepeatedField( + 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.AggregationResultBatch) { + return mergeFrom((com.google.datastore.v1.AggregationResultBatch) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.AggregationResultBatch other) { + if (other == com.google.datastore.v1.AggregationResultBatch.getDefaultInstance()) return this; + if (aggregationResultsBuilder_ == null) { + if (!other.aggregationResults_.isEmpty()) { + if (aggregationResults_.isEmpty()) { + aggregationResults_ = other.aggregationResults_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureAggregationResultsIsMutable(); + aggregationResults_.addAll(other.aggregationResults_); + } + onChanged(); + } + } else { + if (!other.aggregationResults_.isEmpty()) { + if (aggregationResultsBuilder_.isEmpty()) { + aggregationResultsBuilder_.dispose(); + aggregationResultsBuilder_ = null; + aggregationResults_ = other.aggregationResults_; + bitField0_ = (bitField0_ & ~0x00000001); + aggregationResultsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders + ? getAggregationResultsFieldBuilder() + : null; + } else { + aggregationResultsBuilder_.addAllMessages(other.aggregationResults_); + } + } + } + if (other.moreResults_ != 0) { + setMoreResultsValue(other.getMoreResultsValue()); + } + if (other.hasReadTime()) { + mergeReadTime(other.getReadTime()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.datastore.v1.AggregationResult m = + input.readMessage( + com.google.datastore.v1.AggregationResult.parser(), extensionRegistry); + if (aggregationResultsBuilder_ == null) { + ensureAggregationResultsIsMutable(); + aggregationResults_.add(m); + } else { + aggregationResultsBuilder_.addMessage(m); + } + break; + } // case 10 + case 16: + { + moreResults_ = input.readEnum(); + + break; + } // case 16 + case 26: + { + input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private int bitField0_; + + private java.util.List aggregationResults_ = + java.util.Collections.emptyList(); + + private void ensureAggregationResultsIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + aggregationResults_ = + new java.util.ArrayList(aggregationResults_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.AggregationResult, + com.google.datastore.v1.AggregationResult.Builder, + com.google.datastore.v1.AggregationResultOrBuilder> + aggregationResultsBuilder_; + + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public java.util.List getAggregationResultsList() { + if (aggregationResultsBuilder_ == null) { + return java.util.Collections.unmodifiableList(aggregationResults_); + } else { + return aggregationResultsBuilder_.getMessageList(); + } + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public int getAggregationResultsCount() { + if (aggregationResultsBuilder_ == null) { + return aggregationResults_.size(); + } else { + return aggregationResultsBuilder_.getCount(); + } + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public com.google.datastore.v1.AggregationResult getAggregationResults(int index) { + if (aggregationResultsBuilder_ == null) { + return aggregationResults_.get(index); + } else { + return aggregationResultsBuilder_.getMessage(index); + } + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public Builder setAggregationResults( + int index, com.google.datastore.v1.AggregationResult value) { + if (aggregationResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureAggregationResultsIsMutable(); + aggregationResults_.set(index, value); + onChanged(); + } else { + aggregationResultsBuilder_.setMessage(index, value); + } + return this; + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public Builder setAggregationResults( + int index, com.google.datastore.v1.AggregationResult.Builder builderForValue) { + if (aggregationResultsBuilder_ == null) { + ensureAggregationResultsIsMutable(); + aggregationResults_.set(index, builderForValue.build()); + onChanged(); + } else { + aggregationResultsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public Builder addAggregationResults(com.google.datastore.v1.AggregationResult value) { + if (aggregationResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureAggregationResultsIsMutable(); + aggregationResults_.add(value); + onChanged(); + } else { + aggregationResultsBuilder_.addMessage(value); + } + return this; + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public Builder addAggregationResults( + int index, com.google.datastore.v1.AggregationResult value) { + if (aggregationResultsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureAggregationResultsIsMutable(); + aggregationResults_.add(index, value); + onChanged(); + } else { + aggregationResultsBuilder_.addMessage(index, value); + } + return this; + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public Builder addAggregationResults( + com.google.datastore.v1.AggregationResult.Builder builderForValue) { + if (aggregationResultsBuilder_ == null) { + ensureAggregationResultsIsMutable(); + aggregationResults_.add(builderForValue.build()); + onChanged(); + } else { + aggregationResultsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public Builder addAggregationResults( + int index, com.google.datastore.v1.AggregationResult.Builder builderForValue) { + if (aggregationResultsBuilder_ == null) { + ensureAggregationResultsIsMutable(); + aggregationResults_.add(index, builderForValue.build()); + onChanged(); + } else { + aggregationResultsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public Builder addAllAggregationResults( + java.lang.Iterable values) { + if (aggregationResultsBuilder_ == null) { + ensureAggregationResultsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll(values, aggregationResults_); + onChanged(); + } else { + aggregationResultsBuilder_.addAllMessages(values); + } + return this; + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public Builder clearAggregationResults() { + if (aggregationResultsBuilder_ == null) { + aggregationResults_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + aggregationResultsBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public Builder removeAggregationResults(int index) { + if (aggregationResultsBuilder_ == null) { + ensureAggregationResultsIsMutable(); + aggregationResults_.remove(index); + onChanged(); + } else { + aggregationResultsBuilder_.remove(index); + } + return this; + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public com.google.datastore.v1.AggregationResult.Builder getAggregationResultsBuilder( + int index) { + return getAggregationResultsFieldBuilder().getBuilder(index); + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsOrBuilder( + int index) { + if (aggregationResultsBuilder_ == null) { + return aggregationResults_.get(index); + } else { + return aggregationResultsBuilder_.getMessageOrBuilder(index); + } + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public java.util.List + getAggregationResultsOrBuilderList() { + if (aggregationResultsBuilder_ != null) { + return aggregationResultsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(aggregationResults_); + } + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBuilder() { + return getAggregationResultsFieldBuilder() + .addBuilder(com.google.datastore.v1.AggregationResult.getDefaultInstance()); + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public com.google.datastore.v1.AggregationResult.Builder addAggregationResultsBuilder( + int index) { + return getAggregationResultsFieldBuilder() + .addBuilder(index, com.google.datastore.v1.AggregationResult.getDefaultInstance()); + } + /** + * + * + * 
+     * The aggregation results for this batch.
+     *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + public java.util.List + getAggregationResultsBuilderList() { + return getAggregationResultsFieldBuilder().getBuilderList(); + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.AggregationResult, + com.google.datastore.v1.AggregationResult.Builder, + com.google.datastore.v1.AggregationResultOrBuilder> + getAggregationResultsFieldBuilder() { + if (aggregationResultsBuilder_ == null) { + aggregationResultsBuilder_ = + new com.google.protobuf.RepeatedFieldBuilderV3< + com.google.datastore.v1.AggregationResult, + com.google.datastore.v1.AggregationResult.Builder, + com.google.datastore.v1.AggregationResultOrBuilder>( + aggregationResults_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + aggregationResults_ = null; + } + return aggregationResultsBuilder_; + } + + private int moreResults_ = 0; + /** + * + * + * 
+     * The state of the query after the current batch.
+     * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+     * expected result type is limited to `NO_MORE_RESULTS`.
+     *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2; + * + * @return The enum numeric value on the wire for moreResults. + */ + @java.lang.Override + public int getMoreResultsValue() { + return moreResults_; + } + /** + * + * + * 
+     * The state of the query after the current batch.
+     * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+     * expected result type is limited to `NO_MORE_RESULTS`.
+     *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2; + * + * @param value The enum numeric value on the wire for moreResults to set. + * @return This builder for chaining. + */ + public Builder setMoreResultsValue(int value) { + + moreResults_ = value; + onChanged(); + return this; + } + /** + * + * + * 
+     * The state of the query after the current batch.
+     * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+     * expected result type is limited to `NO_MORE_RESULTS`.
+     *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2; + * + * @return The moreResults. + */ + @java.lang.Override + 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; + } + /** + * + * + * 
+     * The state of the query after the current batch.
+     * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+     * expected result type is limited to `NO_MORE_RESULTS`.
+     *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2; + * + * @param value The moreResults to set. + * @return This builder for chaining. + */ + public Builder setMoreResults(com.google.datastore.v1.QueryResultBatch.MoreResultsType value) { + if (value == null) { + throw new NullPointerException(); + } + + moreResults_ = value.getNumber(); + onChanged(); + return this; + } + /** + * + * + * 
+     * The state of the query after the current batch.
+     * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+     * expected result type is limited to `NO_MORE_RESULTS`.
+     *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2; + * + * @return This builder for chaining. + */ + public Builder clearMoreResults() { + + moreResults_ = 0; + onChanged(); + return this; + } + + private com.google.protobuf.Timestamp readTime_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Timestamp, + com.google.protobuf.Timestamp.Builder, + com.google.protobuf.TimestampOrBuilder> + readTimeBuilder_; + /** + * + * + * 
+     * Read timestamp this batch was returned from.
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater timestamp. Each batch's read timestamp
+     * is valid for all preceding batches.
+     *
+ * + * .google.protobuf.Timestamp read_time = 3; + * + * @return Whether the readTime field is set. + */ + public boolean hasReadTime() { + return readTimeBuilder_ != null || readTime_ != null; + } + /** + * + * + * 
+     * Read timestamp this batch was returned from.
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater timestamp. Each batch's read timestamp
+     * is valid for all preceding batches.
+     *
+ * + * .google.protobuf.Timestamp read_time = 3; + * + * @return The readTime. + */ + public com.google.protobuf.Timestamp getReadTime() { + if (readTimeBuilder_ == null) { + return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_; + } else { + return readTimeBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * Read timestamp this batch was returned from.
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater timestamp. Each batch's read timestamp
+     * is valid for all preceding batches.
+     *
+ * + * .google.protobuf.Timestamp read_time = 3; + */ + public Builder setReadTime(com.google.protobuf.Timestamp value) { + if (readTimeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + readTime_ = value; + onChanged(); + } else { + readTimeBuilder_.setMessage(value); + } + + return this; + } + /** + * + * + * 
+     * Read timestamp this batch was returned from.
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater timestamp. Each batch's read timestamp
+     * is valid for all preceding batches.
+     *
+ * + * .google.protobuf.Timestamp read_time = 3; + */ + public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue) { + if (readTimeBuilder_ == null) { + readTime_ = builderForValue.build(); + onChanged(); + } else { + readTimeBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * + * + * 
+     * Read timestamp this batch was returned from.
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater timestamp. Each batch's read timestamp
+     * is valid for all preceding batches.
+     *
+ * + * .google.protobuf.Timestamp read_time = 3; + */ + public Builder mergeReadTime(com.google.protobuf.Timestamp value) { + if (readTimeBuilder_ == null) { + if (readTime_ != null) { + readTime_ = + com.google.protobuf.Timestamp.newBuilder(readTime_).mergeFrom(value).buildPartial(); + } else { + readTime_ = value; + } + onChanged(); + } else { + readTimeBuilder_.mergeFrom(value); + } + + return this; + } + /** + * + * + * 
+     * Read timestamp this batch was returned from.
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater timestamp. Each batch's read timestamp
+     * is valid for all preceding batches.
+     *
+ * + * .google.protobuf.Timestamp read_time = 3; + */ + public Builder clearReadTime() { + if (readTimeBuilder_ == null) { + readTime_ = null; + onChanged(); + } else { + readTime_ = null; + readTimeBuilder_ = null; + } + + return this; + } + /** + * + * + * 
+     * Read timestamp this batch was returned from.
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater timestamp. Each batch's read timestamp
+     * is valid for all preceding batches.
+     *
+ * + * .google.protobuf.Timestamp read_time = 3; + */ + public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() { + + onChanged(); + return getReadTimeFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * Read timestamp this batch was returned from.
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater timestamp. Each batch's read timestamp
+     * is valid for all preceding batches.
+     *
+ * + * .google.protobuf.Timestamp read_time = 3; + */ + public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { + if (readTimeBuilder_ != null) { + return readTimeBuilder_.getMessageOrBuilder(); + } else { + return readTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : readTime_; + } + } + /** + * + * + * 
+     * Read timestamp this batch was returned from.
+     * In a single transaction, subsequent query result batches for the same query
+     * can have a greater timestamp. Each batch's read timestamp
+     * is valid for all preceding batches.
+     *
+ * + * .google.protobuf.Timestamp read_time = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Timestamp, + com.google.protobuf.Timestamp.Builder, + com.google.protobuf.TimestampOrBuilder> + getReadTimeFieldBuilder() { + if (readTimeBuilder_ == null) { + readTimeBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.protobuf.Timestamp, + com.google.protobuf.Timestamp.Builder, + com.google.protobuf.TimestampOrBuilder>( + getReadTime(), getParentForChildren(), isClean()); + readTime_ = null; + } + return readTimeBuilder_; + } + + @java.lang.Override + public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.AggregationResultBatch) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.AggregationResultBatch) + private static final com.google.datastore.v1.AggregationResultBatch DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.AggregationResultBatch(); + } + + public static com.google.datastore.v1.AggregationResultBatch getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public AggregationResultBatch parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.datastore.v1.AggregationResultBatch getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java new file mode 100644 index 000000000..e104e9556 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultBatchOrBuilder.java @@ -0,0 +1,150 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/aggregation_result.proto + +package com.google.datastore.v1; + +public interface AggregationResultBatchOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationResultBatch) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + * 
+   * The aggregation results for this batch.
+   *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + java.util.List getAggregationResultsList(); + /** + * + * + * 
+   * The aggregation results for this batch.
+   *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + com.google.datastore.v1.AggregationResult getAggregationResults(int index); + /** + * + * + * 
+   * The aggregation results for this batch.
+   *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + int getAggregationResultsCount(); + /** + * + * + * 
+   * The aggregation results for this batch.
+   *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + java.util.List + getAggregationResultsOrBuilderList(); + /** + * + * + * 
+   * The aggregation results for this batch.
+   *
+ * + * repeated .google.datastore.v1.AggregationResult aggregation_results = 1; + */ + com.google.datastore.v1.AggregationResultOrBuilder getAggregationResultsOrBuilder(int index); + + /** + * + * + * 
+   * The state of the query after the current batch.
+   * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+   * expected result type is limited to `NO_MORE_RESULTS`.
+   *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2; + * + * @return The enum numeric value on the wire for moreResults. + */ + int getMoreResultsValue(); + /** + * + * + * 
+   * The state of the query after the current batch.
+   * Only COUNT(*) aggregations are supported in the initial launch. Therefore,
+   * expected result type is limited to `NO_MORE_RESULTS`.
+   *
+ * + * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 2; + * + * @return The moreResults. + */ + com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults(); + + /** + * + * + * 
+   * Read timestamp this batch was returned from.
+   * In a single transaction, subsequent query result batches for the same query
+   * can have a greater timestamp. Each batch's read timestamp
+   * is valid for all preceding batches.
+   *
+ * + * .google.protobuf.Timestamp read_time = 3; + * + * @return Whether the readTime field is set. + */ + boolean hasReadTime(); + /** + * + * + * 
+   * Read timestamp this batch was returned from.
+   * In a single transaction, subsequent query result batches for the same query
+   * can have a greater timestamp. Each batch's read timestamp
+   * is valid for all preceding batches.
+   *
+ * + * .google.protobuf.Timestamp read_time = 3; + * + * @return The readTime. + */ + com.google.protobuf.Timestamp getReadTime(); + /** + * + * + * 
+   * Read timestamp this batch was returned from.
+   * In a single transaction, subsequent query result batches for the same query
+   * can have a greater timestamp. Each batch's read timestamp
+   * is valid for all preceding batches.
+   *
+ * + * .google.protobuf.Timestamp read_time = 3; + */ + com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder(); +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java new file mode 100644 index 000000000..7d03c654b --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultOrBuilder.java @@ -0,0 +1,99 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/aggregation_result.proto + +package com.google.datastore.v1; + +public interface AggregationResultOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.AggregationResult) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + * 
+   * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+   * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+   * assigned to the aggregation function on input and the size of this map
+   * equals the number of aggregation functions in the query.
+   *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + int getAggregatePropertiesCount(); + /** + * + * + * 
+   * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+   * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+   * assigned to the aggregation function on input and the size of this map
+   * equals the number of aggregation functions in the query.
+   *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + boolean containsAggregateProperties(java.lang.String key); + /** Use {@link #getAggregatePropertiesMap()} instead. */ + @java.lang.Deprecated + java.util.Map getAggregateProperties(); + /** + * + * + * 
+   * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+   * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+   * assigned to the aggregation function on input and the size of this map
+   * equals the number of aggregation functions in the query.
+   *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + java.util.Map getAggregatePropertiesMap(); + /** + * + * + * 
+   * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+   * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+   * assigned to the aggregation function on input and the size of this map
+   * equals the number of aggregation functions in the query.
+   *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + + /* nullable */ + com.google.datastore.v1.Value getAggregatePropertiesOrDefault( + java.lang.String key, + /* nullable */ + com.google.datastore.v1.Value defaultValue); + /** + * + * + * 
+   * The result of the aggregation functions, ex: `COUNT(*) AS total_entities`.
+   * The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias]
+   * assigned to the aggregation function on input and the size of this map
+   * equals the number of aggregation functions in the query.
+   *
+ * + * map<string, .google.datastore.v1.Value> aggregate_properties = 2; + */ + com.google.datastore.v1.Value getAggregatePropertiesOrThrow(java.lang.String key); +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java new file mode 100644 index 000000000..5f055196f --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationResultProto.java @@ -0,0 +1,111 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/aggregation_result.proto + +package com.google.datastore.v1; + +public final class AggregationResultProto { + private AggregationResultProto() {} + + 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_AggregationResult_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_AggregationResult_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_AggregationResult_AggregatePropertiesEntry_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_AggregationResult_AggregatePropertiesEntry_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_AggregationResultBatch_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_AggregationResultBatch_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + return descriptor; + } + + private static com.google.protobuf.Descriptors.FileDescriptor descriptor; + + static { + java.lang.String[] descriptorData = { + "\n,google/datastore/v1/aggregation_result" + + ".proto\022\023google.datastore.v1\032 google/data" + + "store/v1/entity.proto\032\037google/datastore/" + + "v1/query.proto\032\037google/protobuf/timestam" + + "p.proto\"\312\001\n\021AggregationResult\022]\n\024aggrega" + + "te_properties\030\002 \003(\0132?.google.datastore.v" + + "1.AggregationResult.AggregatePropertiesE" + + "ntry\032V\n\030AggregatePropertiesEntry\022\013\n\003key\030" + + "\001 \001(\t\022)\n\005value\030\002 \001(\0132\032.google.datastore." + + "v1.Value:\0028\001\"\331\001\n\026AggregationResultBatch\022" + + "C\n\023aggregation_results\030\001 \003(\0132&.google.da" + + "tastore.v1.AggregationResult\022K\n\014more_res" + + "ults\030\002 \001(\01625.google.datastore.v1.QueryRe" + + "sultBatch.MoreResultsType\022-\n\tread_time\030\003" + + " \001(\0132\032.google.protobuf.TimestampB\310\001\n\027com" + + ".google.datastore.v1B\026AggregationResultP" + + "rotoP\001Z(); - mutable_bitField0_ |= 0x00000001; - } - 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(); - - databaseId_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - keys_ = java.util.Collections.unmodifiableList(keys_); - } - 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_AllocateIdsRequest_descriptor; @@ -338,7 +272,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -356,7 +290,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -375,7 +309,7 @@ public boolean equals(final java.lang.Object obj) { 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; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -394,7 +328,7 @@ public int hashCode() { hash = (37 * hash) + KEYS_FIELD_NUMBER; hash = (53 * hash) + getKeysList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -523,19 +457,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.AllocateIdsRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getKeysFieldBuilder(); - } } @java.lang.Override @@ -547,10 +472,11 @@ public Builder clear() { if (keysBuilder_ == null) { keys_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + keys_ = null; keysBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -674,7 +600,7 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -689,17 +615,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.AllocateIdsRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.datastore.v1.Key m = + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry); + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(m); + } else { + keysBuilder_.addMessage(m); + } + break; + } // case 10 + case 66: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 66 + case 74: + { + databaseId_ = input.readStringRequireUtf8(); + + break; + } // case 74 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.AllocateIdsRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1337,7 +1301,18 @@ public AllocateIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AllocateIdsRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 a2e0dd89b..68a8619b6 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 @@ -52,58 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private AllocateIdsResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - keys_ = java.util.Collections.unmodifiableList(keys_); - } - 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_AllocateIdsResponse_descriptor; @@ -209,7 +157,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < keys_.size(); i++) { output.writeMessage(1, keys_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -221,7 +169,7 @@ public int getSerializedSize() { for (int i = 0; i < keys_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, keys_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -238,7 +186,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.datastore.v1.AllocateIdsResponse) obj; if (!getKeysList().equals(other.getKeysList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -253,7 +201,7 @@ public int hashCode() { hash = (37 * hash) + KEYS_FIELD_NUMBER; hash = (53 * hash) + getKeysList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -382,19 +330,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.AllocateIdsResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getKeysFieldBuilder(); - } } @java.lang.Override @@ -402,10 +341,11 @@ public Builder clear() { super.clear(); if (keysBuilder_ == null) { keys_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + keys_ = null; keysBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -519,7 +459,7 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsResponse other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -534,17 +474,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.AllocateIdsResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.datastore.v1.Key m = + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry); + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(m); + } else { + keysBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.AllocateIdsResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -942,7 +908,18 @@ public AllocateIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AllocateIdsResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 8485701c2..955ce99f4 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 @@ -52,59 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ArrayValue( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - values_ = java.util.Collections.unmodifiableList(values_); - } - 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_ArrayValue_descriptor; @@ -215,7 +162,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < values_.size(); i++) { output.writeMessage(1, values_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -227,7 +174,7 @@ public int getSerializedSize() { for (int i = 0; i < values_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, values_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -243,7 +190,7 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.ArrayValue other = (com.google.datastore.v1.ArrayValue) obj; if (!getValuesList().equals(other.getValuesList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -258,7 +205,7 @@ public int hashCode() { hash = (37 * hash) + VALUES_FIELD_NUMBER; hash = (53 * hash) + getValuesList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -386,19 +333,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.ArrayValue.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getValuesFieldBuilder(); - } } @java.lang.Override @@ -406,10 +344,11 @@ public Builder clear() { super.clear(); if (valuesBuilder_ == null) { values_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + values_ = null; valuesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -522,7 +461,7 @@ public Builder mergeFrom(com.google.datastore.v1.ArrayValue other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -537,17 +476,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.ArrayValue parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.datastore.v1.Value m = + input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry); + if (valuesBuilder_ == null) { + ensureValuesIsMutable(); + values_.add(m); + } else { + valuesBuilder_.addMessage(m); + } + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.ArrayValue) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -966,7 +931,18 @@ public ArrayValue parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ArrayValue(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 55b17ae9e..4dcc56f2f 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 @@ -53,75 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BeginTransactionRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 66: - { - java.lang.String s = input.readStringRequireUtf8(); - - projectId_ = s; - break; - } - case 74: - { - java.lang.String s = input.readStringRequireUtf8(); - - databaseId_ = s; - break; - } - 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; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -310,7 +241,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (transactionOptions_ != null) { output.writeMessage(10, getTransactionOptions()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -328,7 +259,7 @@ public int getSerializedSize() { if (transactionOptions_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getTransactionOptions()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -350,7 +281,7 @@ public boolean equals(final java.lang.Object obj) { if (hasTransactionOptions()) { if (!getTransactionOptions().equals(other.getTransactionOptions())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -369,7 +300,7 @@ public int hashCode() { hash = (37 * hash) + TRANSACTION_OPTIONS_FIELD_NUMBER; hash = (53 * hash) + getTransactionOptions().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -498,17 +429,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.BeginTransactionRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -619,7 +543,7 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other) if (other.hasTransactionOptions()) { mergeTransactionOptions(other.getTransactionOptions()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -634,17 +558,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.BeginTransactionRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 66: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 66 + case 74: + { + databaseId_ = input.readStringRequireUtf8(); + + break; + } // case 74 + case 82: + { + input.readMessage( + getTransactionOptionsFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 82 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.BeginTransactionRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1088,7 +1045,18 @@ public BeginTransactionRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BeginTransactionRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 a63b48ba7..94f557d63 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 @@ -52,50 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BeginTransactionResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - 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 (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -146,7 +102,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!transaction_.isEmpty()) { output.writeBytes(1, transaction_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -158,7 +114,7 @@ public int getSerializedSize() { if (!transaction_.isEmpty()) { size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, transaction_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -175,7 +131,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.datastore.v1.BeginTransactionResponse) obj; if (!getTransaction().equals(other.getTransaction())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -188,7 +144,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + TRANSACTION_FIELD_NUMBER; hash = (53 * hash) + getTransaction().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -317,17 +273,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.BeginTransactionResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -416,7 +365,7 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionResponse other) if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) { setTransaction(other.getTransaction()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -431,17 +380,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.BeginTransactionResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + transaction_ = input.readBytes(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.BeginTransactionResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -532,7 +501,18 @@ public BeginTransactionResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BeginTransactionResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 a52f58dd8..0cfbb87f0 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 @@ -55,86 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CommitRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - transactionSelector_ = input.readBytes(); - transactionSelectorCase_ = 1; - 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; - } - case 66: - { - 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; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - mutations_ = java.util.Collections.unmodifiableList(mutations_); - } - 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_CommitRequest_descriptor; @@ -675,7 +595,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -701,7 +621,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -728,7 +648,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -757,7 +677,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -885,19 +805,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.CommitRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getMutationsFieldBuilder(); - } } @java.lang.Override @@ -911,10 +822,11 @@ public Builder clear() { if (mutationsBuilder_ == null) { mutations_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + mutations_ = null; mutationsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); transactionSelectorCase_ = 0; transactionSelector_ = null; return this; @@ -1059,7 +971,7 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1074,17 +986,67 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.CommitRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + transactionSelector_ = input.readBytes(); + transactionSelectorCase_ = 1; + break; + } // case 10 + case 40: + { + mode_ = input.readEnum(); + + break; + } // case 40 + case 50: + { + com.google.datastore.v1.Mutation m = + input.readMessage(com.google.datastore.v1.Mutation.parser(), extensionRegistry); + if (mutationsBuilder_ == null) { + ensureMutationsIsMutable(); + mutations_.add(m); + } else { + mutationsBuilder_.addMessage(m); + } + break; + } // case 50 + case 66: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 66 + case 74: + { + databaseId_ = input.readStringRequireUtf8(); + + break; + } // case 74 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.CommitRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2039,7 +2001,18 @@ public CommitRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommitRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 a11c88357..785c9d38d 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 @@ -52,81 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CommitResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 32: - { - indexUpdates_ = input.readInt32(); - break; - } - case 66: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (commitTime_ != null) { - subBuilder = commitTime_.toBuilder(); - } - commitTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(commitTime_); - commitTime_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_); - } - 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_CommitResponse_descriptor; @@ -304,7 +229,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (commitTime_ != null) { output.writeMessage(8, getCommitTime()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -322,7 +247,7 @@ public int getSerializedSize() { if (commitTime_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getCommitTime()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -343,7 +268,7 @@ public boolean equals(final java.lang.Object obj) { if (hasCommitTime()) { if (!getCommitTime().equals(other.getCommitTime())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -364,7 +289,7 @@ public int hashCode() { hash = (37 * hash) + COMMIT_TIME_FIELD_NUMBER; hash = (53 * hash) + getCommitTime().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -493,19 +418,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.CommitResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getMutationResultsFieldBuilder(); - } } @java.lang.Override @@ -513,10 +429,11 @@ public Builder clear() { super.clear(); if (mutationResultsBuilder_ == null) { mutationResults_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + mutationResults_ = null; mutationResultsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); indexUpdates_ = 0; if (commitTimeBuilder_ == null) { @@ -650,7 +567,7 @@ public Builder mergeFrom(com.google.datastore.v1.CommitResponse other) { if (other.hasCommitTime()) { mergeCommitTime(other.getCommitTime()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -665,17 +582,56 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.CommitResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 26: + { + com.google.datastore.v1.MutationResult m = + input.readMessage( + com.google.datastore.v1.MutationResult.parser(), extensionRegistry); + if (mutationResultsBuilder_ == null) { + ensureMutationResultsIsMutable(); + mutationResults_.add(m); + } else { + mutationResultsBuilder_.addMessage(m); + } + break; + } // case 26 + case 32: + { + indexUpdates_ = input.readInt32(); + + break; + } // case 32 + case 66: + { + input.readMessage(getCommitTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 66 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.CommitResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1323,7 +1279,18 @@ public CommitResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CommitResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 c67e8c36c..dda88803e 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 @@ -53,66 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CompositeFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - 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; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - filters_ = java.util.Collections.unmodifiableList(filters_); - } - 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_CompositeFilter_descriptor; @@ -398,7 +338,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < filters_.size(); i++) { output.writeMessage(2, filters_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -413,7 +353,7 @@ public int getSerializedSize() { for (int i = 0; i < filters_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, filters_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -430,7 +370,7 @@ public boolean equals(final java.lang.Object obj) { if (op_ != other.op_) return false; if (!getFiltersList().equals(other.getFiltersList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -447,7 +387,7 @@ public int hashCode() { hash = (37 * hash) + FILTERS_FIELD_NUMBER; hash = (53 * hash) + getFiltersList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -576,19 +516,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.CompositeFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getFiltersFieldBuilder(); - } } @java.lang.Override @@ -598,10 +529,11 @@ public Builder clear() { if (filtersBuilder_ == null) { filters_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + filters_ = null; filtersBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -719,7 +651,7 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -734,17 +666,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.CompositeFilter parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + op_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + com.google.datastore.v1.Filter m = + input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry); + if (filtersBuilder_ == null) { + ensureFiltersIsMutable(); + filters_.add(m); + } else { + filtersBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.CompositeFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1257,7 +1221,18 @@ public CompositeFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CompositeFilter(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 9c945ae1d..dee44ef43 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 @@ -43,6 +43,14 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r 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_RunAggregationQueryRequest_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_RunAggregationQueryRequest_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_RunAggregationQueryResponse_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_RunAggregationQueryResponse_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_google_datastore_v1_BeginTransactionRequest_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable @@ -119,118 +127,136 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "\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\032\037google/protobuf/timestamp" - + ".proto\"\242\001\n\rLookupRequest\022\027\n\nproject_id\030\010" - + " \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\0226\n\014read_o" - + "ptions\030\001 \001(\0132 .google.datastore.v1.ReadO" - + "ptions\022+\n\004keys\030\003 \003(\0132\030.google.datastore." - + "v1.KeyB\003\340A\002\"\321\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.Key\022-\n\tread_time\030\007 \001(\0132\032.go" - + "ogle.protobuf.Timestamp\"\236\002\n\017RunQueryRequ" - + "est\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013database" - + "_id\030\t \001(\t\0226\n\014partition_id\030\002 \001(\0132 .google" - + ".datastore.v1.PartitionId\0226\n\014read_option" - + "s\030\001 \001(\0132 .google.datastore.v1.ReadOption" - + "s\022+\n\005query\030\003 \001(\0132\032.google.datastore.v1.Q" - + "ueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google.datas" - + "tore.v1.GqlQueryH\000B\014\n\nquery_type\"s\n\020RunQ" - + "ueryResponse\0224\n\005batch\030\001 \001(\0132%.google.dat" - + "astore.v1.QueryResultBatch\022)\n\005query\030\002 \001(" - + "\0132\032.google.datastore.v1.Query\"\215\001\n\027BeginT" - + "ransactionRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340" - + "A\002\022\023\n\013database_id\030\t \001(\t\022D\n\023transaction_o" - + "ptions\030\n \001(\0132\'.google.datastore.v1.Trans" - + "actionOptions\"/\n\030BeginTransactionRespons" - + "e\022\023\n\013transaction\030\001 \001(\014\"Y\n\017RollbackReques" - + "t\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_i" - + "d\030\t \001(\t\022\030\n\013transaction\030\001 \001(\014B\003\340A\002\"\022\n\020Rol" - + "lbackResponse\"\235\002\n\rCommitRequest\022\027\n\nproje" - + "ct_id\030\010 \001(\tB\003\340A\002\022\023\n\013database_id\030\t \001(\t\0225\n" - + "\004mode\030\005 \001(\0162\'.google.datastore.v1.Commit" - + "Request.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\tm" - + "utations\030\006 \003(\0132\035.google.datastore.v1.Mut" - + "ation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\rT" - + "RANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026\n" - + "\024transaction_selector\"\227\001\n\016CommitResponse" - + "\022=\n\020mutation_results\030\003 \003(\0132#.google.data" - + "store.v1.MutationResult\022\025\n\rindex_updates" - + "\030\004 \001(\005\022/\n\013commit_time\030\010 \001(\0132\032.google.pro" - + "tobuf.Timestamp\"o\n\022AllocateIdsRequest\022\027\n" - + "\nproject_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." - + "KeyB\003\340A\002\"=\n\023AllocateIdsResponse\022&\n\004keys\030" - + "\001 \003(\0132\030.google.datastore.v1.Key\"n\n\021Reser" - + "veIdsRequest\022\027\n\nproject_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.googl" - + "e.datastore.v1.KeyB\003\340A\002\"\024\n\022ReserveIdsRes" - + "ponse\"\272\002\n\010Mutation\022-\n\006insert\030\004 \001(\0132\033.goo" - + "gle.datastore.v1.EntityH\000\022-\n\006update\030\005 \001(" - + "\0132\033.google.datastore.v1.EntityH\000\022-\n\006upse" - + "rt\030\006 \001(\0132\033.google.datastore.v1.EntityH\000\022" - + "*\n\006delete\030\007 \001(\0132\030.google.datastore.v1.Ke" - + "yH\000\022\026\n\014base_version\030\010 \001(\003H\001\0221\n\013update_ti" - + "me\030\013 \001(\0132\032.google.protobuf.TimestampH\001B\013" - + "\n\toperationB\035\n\033conflict_detection_strate" - + "gy\"\224\001\n\016MutationResult\022%\n\003key\030\003 \001(\0132\030.goo" - + "gle.datastore.v1.Key\022\017\n\007version\030\004 \001(\003\022/\n" - + "\013update_time\030\006 \001(\0132\032.google.protobuf.Tim" - + "estamp\022\031\n\021conflict_detected\030\005 \001(\010\"\206\002\n\013Re" - + "adOptions\022L\n\020read_consistency\030\001 \001(\01620.go" - + "ogle.datastore.v1.ReadOptions.ReadConsis" - + "tencyH\000\022\025\n\013transaction\030\002 \001(\014H\000\022/\n\tread_t" - + "ime\030\004 \001(\0132\032.google.protobuf.TimestampH\000\"" - + "M\n\017ReadConsistency\022 \n\034READ_CONSISTENCY_U" - + "NSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022" - + "\n\020consistency_type\"\222\002\n\022TransactionOption" - + "s\022G\n\nread_write\030\001 \001(\01321.google.datastore" - + ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre" - + "ad_only\030\002 \001(\01320.google.datastore.v1.Tran" - + "sactionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034" - + "\n\024previous_transaction\030\001 \001(\014\0329\n\010ReadOnly" - + "\022-\n\tread_time\030\001 \001(\0132\032.google.protobuf.Ti" - + "mestampB\006\n\004mode2\223\n\n\tDatastore\022\235\001\n\006Lookup" - + "\022\".google.datastore.v1.LookupRequest\032#.g" - + "oogle.datastore.v1.LookupResponse\"J\202\323\344\223\002" - + "%\" /v1/projects/{project_id}:lookup:\001*\332A" - + "\034project_id,read_options,keys\022\206\001\n\010RunQue" - + "ry\022$.google.datastore.v1.RunQueryRequest" - + "\032%.google.datastore.v1.RunQueryResponse\"" - + "-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQu" - + "ery:\001*\022\263\001\n\020BeginTransaction\022,.google.dat" - + "astore.v1.BeginTransactionRequest\032-.goog" - + "le.datastore.v1.BeginTransactionResponse" - + "\"B\202\323\344\223\002/\"*/v1/projects/{project_id}:begi" - + "nTransaction:\001*\332A\nproject_id\022\302\001\n\006Commit\022" - + "\".google.datastore.v1.CommitRequest\032#.go" - + "ogle.datastore.v1.CommitResponse\"o\202\323\344\223\002%" - + "\" /v1/projects/{project_id}:commit:\001*\332A%" - + "project_id,mode,transaction,mutations\332A\031" - + "project_id,mode,mutations\022\237\001\n\010Rollback\022$" - + ".google.datastore.v1.RollbackRequest\032%.g" - + "oogle.datastore.v1.RollbackResponse\"F\202\323\344" - + "\223\002\'\"\"/v1/projects/{project_id}:rollback:" - + "\001*\332A\026project_id,transaction\022\244\001\n\013Allocate" - + "Ids\022\'.google.datastore.v1.AllocateIdsReq" - + "uest\032(.google.datastore.v1.AllocateIdsRe" - + "sponse\"B\202\323\344\223\002*\"%/v1/projects/{project_id" - + "}:allocateIds:\001*\332A\017project_id,keys\022\240\001\n\nR" - + "eserveIds\022&.google.datastore.v1.ReserveI" - + "dsRequest\032\'.google.datastore.v1.ReserveI" - + "dsResponse\"A\202\323\344\223\002)\"$/v1/projects/{projec" - + "t_id}:reserveIds:\001*\332A\017project_id,keys\032v\312" - + "A\030datastore.googleapis.com\322AXhttps://www" - + ".googleapis.com/auth/cloud-platform,http" - + "s://www.googleapis.com/auth/datastoreB\300\001" - + "\n\027com.google.datastore.v1B\016DatastoreProt" - + "oP\001Z - 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 (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -349,7 +279,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetProperties(), PropertiesDefaultEntryHolder.defaultEntry, 3); - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -371,7 +301,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, properties__); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -391,7 +321,7 @@ public boolean equals(final java.lang.Object obj) { if (!getKey().equals(other.getKey())) return false; } if (!internalGetProperties().equals(other.internalGetProperties())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -410,7 +340,7 @@ public int hashCode() { hash = (37 * hash) + PROPERTIES_FIELD_NUMBER; hash = (53 * hash) + internalGetProperties().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -560,17 +490,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.datastore.v1.Entity.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -670,7 +593,7 @@ public Builder mergeFrom(com.google.datastore.v1.Entity other) { mergeKey(other.getKey()); } internalGetMutableProperties().mergeFrom(other.internalGetProperties()); - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -685,17 +608,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.Entity parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getKeyFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 26: + { + com.google.protobuf.MapEntry + properties__ = + input.readMessage( + PropertiesDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableProperties() + .getMutableMap() + .put(properties__.getKey(), properties__.getValue()); + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.Entity) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1146,7 +1101,18 @@ public Entity parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Entity(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java index 226d3c862..eef264477 100644 --- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java @@ -52,85 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private EntityResult( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 32: - { - version_ = input.readInt64(); - break; - } - case 42: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (updateTime_ != null) { - subBuilder = updateTime_.toBuilder(); - } - updateTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(updateTime_); - updateTime_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -499,7 +420,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (updateTime_ != null) { output.writeMessage(5, getUpdateTime()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -520,7 +441,7 @@ public int getSerializedSize() { if (updateTime_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getUpdateTime()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -545,7 +466,7 @@ public boolean equals(final java.lang.Object obj) { if (!getUpdateTime().equals(other.getUpdateTime())) return false; } if (!getCursor().equals(other.getCursor())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -568,7 +489,7 @@ public int hashCode() { } hash = (37 * hash) + CURSOR_FIELD_NUMBER; hash = (53 * hash) + getCursor().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -696,17 +617,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.EntityResult.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -827,7 +741,7 @@ public Builder mergeFrom(com.google.datastore.v1.EntityResult other) { if (other.getCursor() != com.google.protobuf.ByteString.EMPTY) { setCursor(other.getCursor()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -842,17 +756,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.EntityResult parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getEntityFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 26: + { + cursor_ = input.readBytes(); + + break; + } // case 26 + case 32: + { + version_ = input.readInt64(); + + break; + } // case 32 + case 42: + { + input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.EntityResult) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1405,7 +1357,18 @@ public EntityResult parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EntityResult(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 9d6a72de9..ec80c9d20 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 @@ -50,77 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Filter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 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 (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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_Filter_descriptor; } @@ -303,7 +232,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (filterTypeCase_ == 2) { output.writeMessage(2, (com.google.datastore.v1.PropertyFilter) filterType_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -322,7 +251,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 2, (com.google.datastore.v1.PropertyFilter) filterType_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -348,7 +277,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -371,7 +300,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -498,22 +427,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.Filter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override public Builder clear() { super.clear(); + if (compositeFilterBuilder_ != null) { + compositeFilterBuilder_.clear(); + } + if (propertyFilterBuilder_ != null) { + propertyFilterBuilder_.clear(); + } filterTypeCase_ = 0; filterType_ = null; return this; @@ -622,7 +550,7 @@ public Builder mergeFrom(com.google.datastore.v1.Filter other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -637,17 +565,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.Filter parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getCompositeFilterFieldBuilder().getBuilder(), extensionRegistry); + filterTypeCase_ = 1; + break; + } // case 10 + case 18: + { + input.readMessage(getPropertyFilterFieldBuilder().getBuilder(), extensionRegistry); + filterTypeCase_ = 2; + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.Filter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1117,7 +1071,18 @@ public Filter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Filter(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 e2026ea3d..5ade45701 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 @@ -54,92 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private GqlQuery( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - 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; - } - 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; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { - positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_); - } - 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_GqlQuery_descriptor; @@ -468,7 +382,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetNamedBindings(), NamedBindingsDefaultEntryHolder.defaultEntry, 5); - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -498,7 +412,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, namedBindings__); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -517,7 +431,7 @@ public boolean equals(final java.lang.Object obj) { 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; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -540,7 +454,7 @@ public int hashCode() { hash = (37 * hash) + POSITIONAL_BINDINGS_FIELD_NUMBER; hash = (53 * hash) + getPositionalBindingsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -689,19 +603,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.datastore.v1.GqlQuery.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getPositionalBindingsFieldBuilder(); - } } @java.lang.Override @@ -714,10 +619,11 @@ public Builder clear() { internalGetMutableNamedBindings().clear(); if (positionalBindingsBuilder_ == null) { positionalBindings_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + positionalBindings_ = null; positionalBindingsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -842,7 +748,7 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -857,17 +763,69 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.GqlQuery parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + queryString_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 16: + { + allowLiterals_ = input.readBool(); + + break; + } // case 16 + case 34: + { + com.google.datastore.v1.GqlQueryParameter m = + input.readMessage( + com.google.datastore.v1.GqlQueryParameter.parser(), extensionRegistry); + if (positionalBindingsBuilder_ == null) { + ensurePositionalBindingsIsMutable(); + positionalBindings_.add(m); + } else { + positionalBindingsBuilder_.addMessage(m); + } + break; + } // case 34 + case 42: + { + com.google.protobuf.MapEntry< + java.lang.String, com.google.datastore.v1.GqlQueryParameter> + namedBindings__ = + input.readMessage( + NamedBindingsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableNamedBindings() + .getMutableMap() + .put(namedBindings__.getKey(), namedBindings__.getValue()); + break; + } // case 42 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.GqlQuery) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1683,7 +1641,18 @@ public GqlQuery parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GqlQuery(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 77f69f37e..826d09f6d 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 @@ -50,66 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private GqlQueryParameter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 26: - { - parameterType_ = input.readBytes(); - parameterTypeCase_ = 3; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -280,7 +220,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (parameterTypeCase_ == 3) { output.writeBytes(3, (com.google.protobuf.ByteString) parameterType_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -299,7 +239,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeBytesSize( 3, (com.google.protobuf.ByteString) parameterType_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -326,7 +266,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -349,7 +289,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -478,22 +418,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.GqlQueryParameter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override public Builder clear() { super.clear(); + if (valueBuilder_ != null) { + valueBuilder_.clear(); + } parameterTypeCase_ = 0; parameterType_ = null; return this; @@ -599,7 +535,7 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQueryParameter other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -614,17 +550,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.GqlQueryParameter parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 18: + { + input.readMessage(getValueFieldBuilder().getBuilder(), extensionRegistry); + parameterTypeCase_ = 2; + break; + } // case 18 + case 26: + { + parameterType_ = input.readBytes(); + parameterTypeCase_ = 3; + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.GqlQueryParameter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -957,7 +919,18 @@ public GqlQueryParameter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GqlQueryParameter(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 54a39945f..5a7013420 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 @@ -55,76 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Key( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 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 (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - path_ = java.util.Collections.unmodifiableList(path_); - } - 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_descriptor; } @@ -302,65 +232,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PathElement( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - kind_ = s; - break; - } - case 16: - { - idType_ = input.readInt64(); - idTypeCase_ = 2; - 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 (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -634,7 +505,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (idTypeCase_ == 3) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, idType_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -654,7 +525,7 @@ public int getSerializedSize() { if (idTypeCase_ == 3) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, idType_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -681,7 +552,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -706,7 +577,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -839,17 +710,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.Key.PathElement.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -967,7 +831,7 @@ public Builder mergeFrom(com.google.datastore.v1.Key.PathElement other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -982,17 +846,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.Key.PathElement parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + kind_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 16: + { + idType_ = input.readInt64(); + idTypeCase_ = 2; + break; + } // case 16 + case 26: + { + java.lang.String s = input.readStringRequireUtf8(); + idTypeCase_ = 3; + idType_ = s; + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.Key.PathElement) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1426,7 +1323,19 @@ public PathElement parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PathElement(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1653,7 +1562,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < path_.size(); i++) { output.writeMessage(2, path_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1668,7 +1577,7 @@ public int getSerializedSize() { for (int i = 0; i < path_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, path_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1688,7 +1597,7 @@ public boolean equals(final java.lang.Object obj) { if (!getPartitionId().equals(other.getPartitionId())) return false; } if (!getPathList().equals(other.getPathList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1707,7 +1616,7 @@ public int hashCode() { hash = (37 * hash) + PATH_FIELD_NUMBER; hash = (53 * hash) + getPathList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1836,19 +1745,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.Key.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getPathFieldBuilder(); - } } @java.lang.Override @@ -1862,10 +1762,11 @@ public Builder clear() { } if (pathBuilder_ == null) { path_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + path_ = null; pathBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -1985,7 +1886,7 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2000,17 +1901,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.Key parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getPartitionIdFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + com.google.datastore.v1.Key.PathElement m = + input.readMessage( + com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry); + if (pathBuilder_ == null) { + ensurePathIsMutable(); + path_.add(m); + } else { + pathBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.Key) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2833,7 +2767,18 @@ public Key parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Key(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 2c1af7333..b99564aff 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 @@ -52,52 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private KindExpression( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -179,7 +133,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -191,7 +145,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -207,7 +161,7 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.KindExpression other = (com.google.datastore.v1.KindExpression) obj; if (!getName().equals(other.getName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -220,7 +174,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -349,17 +303,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.KindExpression.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -448,7 +395,7 @@ public Builder mergeFrom(com.google.datastore.v1.KindExpression other) { name_ = other.name_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -463,17 +410,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.KindExpression parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + name_ = input.readStringRequireUtf8(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.KindExpression) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -615,7 +582,18 @@ public KindExpression parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KindExpression(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 ebf338480..5966f23c7 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 @@ -54,88 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private LookupRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 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; - } - case 66: - { - 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; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - keys_ = java.util.Collections.unmodifiableList(keys_); - } - 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_LookupRequest_descriptor; @@ -400,7 +318,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -421,7 +339,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -443,7 +361,7 @@ public boolean equals(final java.lang.Object obj) { if (!getReadOptions().equals(other.getReadOptions())) return false; } if (!getKeysList().equals(other.getKeysList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -466,7 +384,7 @@ public int hashCode() { hash = (37 * hash) + KEYS_FIELD_NUMBER; hash = (53 * hash) + getKeysList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -594,19 +512,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.LookupRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getKeysFieldBuilder(); - } } @java.lang.Override @@ -624,10 +533,11 @@ public Builder clear() { } if (keysBuilder_ == null) { keys_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + keys_ = null; keysBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -759,7 +669,7 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -774,17 +684,61 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.LookupRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 26: + { + com.google.datastore.v1.Key m = + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry); + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(m); + } else { + keysBuilder_.addMessage(m); + } + break; + } // case 26 + case 66: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 66 + case 74: + { + databaseId_ = input.readStringRequireUtf8(); + + break; + } // case 74 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.LookupRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1589,7 +1543,18 @@ public LookupRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new LookupRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 f28afaa40..133242919 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 @@ -54,102 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private LookupResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 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; - } - 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; - } - case 58: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (readTime_ != null) { - subBuilder = readTime_.toBuilder(); - } - readTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(readTime_); - readTime_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - found_ = java.util.Collections.unmodifiableList(found_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - missing_ = java.util.Collections.unmodifiableList(missing_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - deferred_ = java.util.Collections.unmodifiableList(deferred_); - } - 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_LookupResponse_descriptor; @@ -473,7 +377,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (readTime_ != null) { output.writeMessage(7, getReadTime()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -494,7 +398,7 @@ public int getSerializedSize() { if (readTime_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getReadTime()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -516,7 +420,7 @@ public boolean equals(final java.lang.Object obj) { if (hasReadTime()) { if (!getReadTime().equals(other.getReadTime())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -543,7 +447,7 @@ public int hashCode() { hash = (37 * hash) + READ_TIME_FIELD_NUMBER; hash = (53 * hash) + getReadTime().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -672,21 +576,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.LookupResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getFoundFieldBuilder(); - getMissingFieldBuilder(); - getDeferredFieldBuilder(); - } } @java.lang.Override @@ -694,22 +587,25 @@ public Builder clear() { super.clear(); if (foundBuilder_ == null) { found_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + found_ = null; foundBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (missingBuilder_ == null) { missing_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + missing_ = null; missingBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (deferredBuilder_ == null) { deferred_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + deferred_ = null; deferredBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (readTimeBuilder_ == null) { readTime_ = null; } else { @@ -909,7 +805,7 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) { if (other.hasReadTime()) { mergeReadTime(other.getReadTime()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -924,17 +820,75 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.LookupResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.datastore.v1.EntityResult m = + input.readMessage( + com.google.datastore.v1.EntityResult.parser(), extensionRegistry); + if (foundBuilder_ == null) { + ensureFoundIsMutable(); + found_.add(m); + } else { + foundBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.datastore.v1.EntityResult m = + input.readMessage( + com.google.datastore.v1.EntityResult.parser(), extensionRegistry); + if (missingBuilder_ == null) { + ensureMissingIsMutable(); + missing_.add(m); + } else { + missingBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.datastore.v1.Key m = + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry); + if (deferredBuilder_ == null) { + ensureDeferredIsMutable(); + deferred_.add(m); + } else { + deferredBuilder_.addMessage(m); + } + break; + } // case 26 + case 58: + { + input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 58 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.LookupResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2300,7 +2254,18 @@ public LookupResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new LookupResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 aea812247..97fbd92d8 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 @@ -50,127 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Mutation( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 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; - } - 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; - } - 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: - { - conflictDetectionStrategy_ = input.readInt64(); - conflictDetectionStrategyCase_ = 8; - break; - } - case 90: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (conflictDetectionStrategyCase_ == 11) { - subBuilder = - ((com.google.protobuf.Timestamp) conflictDetectionStrategy_).toBuilder(); - } - conflictDetectionStrategy_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.protobuf.Timestamp) conflictDetectionStrategy_); - conflictDetectionStrategy_ = subBuilder.buildPartial(); - } - conflictDetectionStrategyCase_ = 11; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -629,7 +508,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (conflictDetectionStrategyCase_ == 11) { output.writeMessage(11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -668,7 +547,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 11, (com.google.protobuf.Timestamp) conflictDetectionStrategy_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -712,7 +591,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -755,7 +634,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -883,22 +762,30 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.Mutation.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override public Builder clear() { super.clear(); + if (insertBuilder_ != null) { + insertBuilder_.clear(); + } + if (updateBuilder_ != null) { + updateBuilder_.clear(); + } + if (upsertBuilder_ != null) { + upsertBuilder_.clear(); + } + if (deleteBuilder_ != null) { + deleteBuilder_.clear(); + } + if (updateTimeBuilder_ != null) { + updateTimeBuilder_.clear(); + } operationCase_ = 0; operation_ = null; conflictDetectionStrategyCase_ = 0; @@ -1060,7 +947,7 @@ public Builder mergeFrom(com.google.datastore.v1.Mutation other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1075,17 +962,67 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.Mutation parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 34: + { + input.readMessage(getInsertFieldBuilder().getBuilder(), extensionRegistry); + operationCase_ = 4; + break; + } // case 34 + case 42: + { + input.readMessage(getUpdateFieldBuilder().getBuilder(), extensionRegistry); + operationCase_ = 5; + break; + } // case 42 + case 50: + { + input.readMessage(getUpsertFieldBuilder().getBuilder(), extensionRegistry); + operationCase_ = 6; + break; + } // case 50 + case 58: + { + input.readMessage(getDeleteFieldBuilder().getBuilder(), extensionRegistry); + operationCase_ = 7; + break; + } // case 58 + case 64: + { + conflictDetectionStrategy_ = input.readInt64(); + conflictDetectionStrategyCase_ = 8; + break; + } // case 64 + case 90: + { + input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); + conflictDetectionStrategyCase_ = 11; + break; + } // case 90 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.Mutation) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2312,7 +2249,18 @@ public Mutation parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Mutation(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 3a36fee6b..a5b6be766 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 @@ -50,84 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private MutationResult( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 40: - { - conflictDetected_ = input.readBool(); - break; - } - case 50: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (updateTime_ != null) { - subBuilder = updateTime_.toBuilder(); - } - updateTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(updateTime_); - updateTime_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -314,7 +236,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (updateTime_ != null) { output.writeMessage(6, getUpdateTime()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -335,7 +257,7 @@ public int getSerializedSize() { if (updateTime_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getUpdateTime()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -360,7 +282,7 @@ public boolean equals(final java.lang.Object obj) { if (!getUpdateTime().equals(other.getUpdateTime())) return false; } if (getConflictDetected() != other.getConflictDetected()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -383,7 +305,7 @@ public int hashCode() { } hash = (37 * hash) + CONFLICT_DETECTED_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getConflictDetected()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -512,17 +434,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.MutationResult.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -644,7 +559,7 @@ public Builder mergeFrom(com.google.datastore.v1.MutationResult other) { if (other.getConflictDetected() != false) { setConflictDetected(other.getConflictDetected()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -659,17 +574,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.MutationResult parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 26: + { + input.readMessage(getKeyFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 32: + { + version_ = input.readInt64(); + + break; + } // case 32 + case 40: + { + conflictDetected_ = input.readBool(); + + break; + } // case 40 + case 50: + { + input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 50 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.MutationResult) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1220,7 +1173,18 @@ public MutationResult parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new MutationResult(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 49784b939..6f3c39a7b 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 @@ -68,66 +68,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PartitionId( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - projectId_ = s; - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - databaseId_ = s; - break; - } - case 34: - { - java.lang.String s = input.readStringRequireUtf8(); - - namespaceId_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -315,7 +255,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, namespaceId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -333,7 +273,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, namespaceId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -351,7 +291,7 @@ public boolean equals(final java.lang.Object obj) { if (!getProjectId().equals(other.getProjectId())) return false; if (!getDatabaseId().equals(other.getDatabaseId())) return false; if (!getNamespaceId().equals(other.getNamespaceId())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -368,7 +308,7 @@ public int hashCode() { hash = (53 * hash) + getDatabaseId().hashCode(); hash = (37 * hash) + NAMESPACE_ID_FIELD_NUMBER; hash = (53 * hash) + getNamespaceId().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -510,17 +450,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.PartitionId.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -622,7 +555,7 @@ public Builder mergeFrom(com.google.datastore.v1.PartitionId other) { namespaceId_ = other.namespaceId_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -637,17 +570,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.PartitionId parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 18: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 26: + { + databaseId_ = input.readStringRequireUtf8(); + + break; + } // case 26 + case 34: + { + namespaceId_ = input.readStringRequireUtf8(); + + break; + } // case 34 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.PartitionId) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1006,7 +971,18 @@ public PartitionId parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PartitionId(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 1d91086af..649c178c7 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 @@ -50,61 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Projection( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -185,7 +130,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (property_ != null) { output.writeMessage(1, getProperty()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -197,7 +142,7 @@ public int getSerializedSize() { if (property_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getProperty()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -216,7 +161,7 @@ public boolean equals(final java.lang.Object obj) { if (hasProperty()) { if (!getProperty().equals(other.getProperty())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -231,7 +176,7 @@ public int hashCode() { hash = (37 * hash) + PROPERTY_FIELD_NUMBER; hash = (53 * hash) + getProperty().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -359,17 +304,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.Projection.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -464,7 +402,7 @@ public Builder mergeFrom(com.google.datastore.v1.Projection other) { if (other.hasProperty()) { mergeProperty(other.getProperty()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -479,17 +417,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.Projection parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getPropertyFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.Projection) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -710,7 +668,18 @@ public Projection parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Projection(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 cfaa78f90..8349299a7 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 @@ -52,82 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PropertyFilter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 16: - { - int rawValue = input.readEnum(); - - op_ = rawValue; - break; - } - 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; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -647,7 +571,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (value_ != null) { output.writeMessage(3, getValue()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -665,7 +589,7 @@ public int getSerializedSize() { if (value_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getValue()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -689,7 +613,7 @@ public boolean equals(final java.lang.Object obj) { if (hasValue()) { if (!getValue().equals(other.getValue())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -710,7 +634,7 @@ public int hashCode() { hash = (37 * hash) + VALUE_FIELD_NUMBER; hash = (53 * hash) + getValue().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -839,17 +763,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.PropertyFilter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -965,7 +882,7 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyFilter other) { if (other.hasValue()) { mergeValue(other.getValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -980,17 +897,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.PropertyFilter parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getPropertyFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 16: + { + op_ = input.readEnum(); + + break; + } // case 16 + case 26: + { + input.readMessage(getValueFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.PropertyFilter) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1480,7 +1429,18 @@ public PropertyFilter parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PropertyFilter(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 4eff592cb..64421fa0b 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 @@ -52,68 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PropertyOrder( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 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 (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -391,7 +329,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) { output.writeEnum(2, direction_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -407,7 +345,7 @@ public int getSerializedSize() { != com.google.datastore.v1.PropertyOrder.Direction.DIRECTION_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, direction_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -427,7 +365,7 @@ public boolean equals(final java.lang.Object obj) { if (!getProperty().equals(other.getProperty())) return false; } if (direction_ != other.direction_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -444,7 +382,7 @@ public int hashCode() { } hash = (37 * hash) + DIRECTION_FIELD_NUMBER; hash = (53 * hash) + direction_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -572,17 +510,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.PropertyOrder.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -684,7 +615,7 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyOrder other) { if (other.direction_ != 0) { setDirectionValue(other.getDirectionValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -699,17 +630,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.PropertyOrder parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getPropertyFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 16: + { + direction_ = input.readEnum(); + + break; + } // case 16 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.PropertyOrder) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1021,7 +978,18 @@ public PropertyOrder parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PropertyOrder(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 bc42d0064..faf96096f 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 @@ -52,52 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PropertyReference( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -181,7 +135,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -193,7 +147,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -210,7 +164,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.datastore.v1.PropertyReference) obj; if (!getName().equals(other.getName())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -223,7 +177,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -352,17 +306,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.PropertyReference.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -451,7 +398,7 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyReference other) { name_ = other.name_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -466,17 +413,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.PropertyReference parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 18: + { + name_ = input.readStringRequireUtf8(); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.PropertyReference) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -623,7 +590,18 @@ public PropertyReference parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PropertyReference(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 781346c62..c0bba0ad9 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 @@ -57,147 +57,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Query( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 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; - } - 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; - } - 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; - } - 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(); - } - limit_ = - input.readMessage(com.google.protobuf.Int32Value.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(limit_); - limit_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - projection_ = java.util.Collections.unmodifiableList(projection_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - kind_ = java.util.Collections.unmodifiableList(kind_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - order_ = java.util.Collections.unmodifiableList(order_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - distinctOn_ = java.util.Collections.unmodifiableList(distinctOn_); - } - 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_Query_descriptor; } @@ -705,7 +564,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (limit_ != null) { output.writeMessage(12, getLimit()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -741,7 +600,7 @@ public int getSerializedSize() { if (limit_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getLimit()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -771,7 +630,7 @@ public boolean equals(final java.lang.Object obj) { if (hasLimit()) { if (!getLimit().equals(other.getLimit())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -812,7 +671,7 @@ public int hashCode() { hash = (37 * hash) + LIMIT_FIELD_NUMBER; hash = (53 * hash) + getLimit().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -939,22 +798,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.Query.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getProjectionFieldBuilder(); - getKindFieldBuilder(); - getOrderFieldBuilder(); - getDistinctOnFieldBuilder(); - } } @java.lang.Override @@ -962,16 +809,18 @@ public Builder clear() { super.clear(); if (projectionBuilder_ == null) { projection_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + projection_ = null; projectionBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (kindBuilder_ == null) { kind_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + kind_ = null; kindBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (filterBuilder_ == null) { filter_ = null; } else { @@ -980,16 +829,18 @@ public Builder clear() { } if (orderBuilder_ == null) { order_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + order_ = null; orderBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (distinctOnBuilder_ == null) { distinctOn_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); } else { + distinctOn_ = null; distinctOnBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000008); startCursor_ = com.google.protobuf.ByteString.EMPTY; endCursor_ = com.google.protobuf.ByteString.EMPTY; @@ -1250,7 +1101,7 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) { if (other.hasLimit()) { mergeLimit(other.getLimit()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1265,17 +1116,113 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.Query parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 18: + { + com.google.datastore.v1.Projection m = + input.readMessage( + com.google.datastore.v1.Projection.parser(), extensionRegistry); + if (projectionBuilder_ == null) { + ensureProjectionIsMutable(); + projection_.add(m); + } else { + projectionBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.datastore.v1.KindExpression m = + input.readMessage( + com.google.datastore.v1.KindExpression.parser(), extensionRegistry); + if (kindBuilder_ == null) { + ensureKindIsMutable(); + kind_.add(m); + } else { + kindBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: + { + input.readMessage(getFilterFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + com.google.datastore.v1.PropertyOrder m = + input.readMessage( + com.google.datastore.v1.PropertyOrder.parser(), extensionRegistry); + if (orderBuilder_ == null) { + ensureOrderIsMutable(); + order_.add(m); + } else { + orderBuilder_.addMessage(m); + } + break; + } // case 42 + case 50: + { + com.google.datastore.v1.PropertyReference m = + input.readMessage( + com.google.datastore.v1.PropertyReference.parser(), extensionRegistry); + if (distinctOnBuilder_ == null) { + ensureDistinctOnIsMutable(); + distinctOn_.add(m); + } else { + distinctOnBuilder_.addMessage(m); + } + break; + } // case 50 + case 58: + { + startCursor_ = input.readBytes(); + + break; + } // case 58 + case 66: + { + endCursor_ = input.readBytes(); + + break; + } // case 66 + case 80: + { + offset_ = input.readInt32(); + + break; + } // case 80 + case 98: + { + input.readMessage(getLimitFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 98 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.Query) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3330,7 +3277,18 @@ public Query parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Query(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 53afbf412..f454c9226 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 @@ -35,6 +35,18 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r 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_AggregationQuery_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_AggregationQuery_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_AggregationQuery_Aggregation_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_google_datastore_v1_KindExpression_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable @@ -107,61 +119,70 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + " \003(\0132&.google.datastore.v1.PropertyRefer" + "ence\022\024\n\014start_cursor\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.Int32Value\"\036\n\016KindExpres" - + "sion\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyReference\022" - + "\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010property\030" - + "\001 \001(\0132&.google.datastore.v1.PropertyRefe" - + "rence\"\321\001\n\rPropertyOrder\0228\n\010property\030\001 \001(" - + "\0132&.google.datastore.v1.PropertyReferenc" - + "e\022?\n\tdirection\030\002 \001(\0162,.google.datastore." - + "v1.PropertyOrder.Direction\"E\n\tDirection\022" - + "\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASCENDING\020" - + "\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020composit" - + "e_filter\030\001 \001(\0132$.google.datastore.v1.Com" - + "positeFilterH\000\022>\n\017property_filter\030\002 \001(\0132" - + "#.google.datastore.v1.PropertyFilterH\000B\r" - + "\n\013filter_type\"\251\001\n\017CompositeFilter\0229\n\002op\030" - + "\001 \001(\0162-.google.datastore.v1.CompositeFil" - + "ter.Operator\022,\n\007filters\030\002 \003(\0132\033.google.d" - + "atastore.v1.Filter\"-\n\010Operator\022\030\n\024OPERAT" - + "OR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\"\352\002\n\016PropertyFi" - + "lter\0228\n\010property\030\001 \001(\0132&.google.datastor" - + "e.v1.PropertyReference\0228\n\002op\030\002 \001(\0162,.goo" - + "gle.datastore.v1.PropertyFilter.Operator" - + "\022)\n\005value\030\003 \001(\0132\032.google.datastore.v1.Va" - + "lue\"\270\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_E" - + "QUAL\020\004\022\t\n\005EQUAL\020\005\022\006\n\002IN\020\006\022\r\n\tNOT_EQUAL\020\t" - + "\022\020\n\014HAS_ANCESTOR\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010GqlQu" - + "ery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allow_liter" - + "als\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\01320.goog" - + "le.datastore.v1.GqlQuery.NamedBindingsEn" - + "try\022C\n\023positional_bindings\030\004 \003(\0132&.googl" - + "e.datastore.v1.GqlQueryParameter\032\\\n\022Name" - + "dBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001" - + "(\0132&.google.datastore.v1.GqlQueryParamet" - + "er:\0028\001\"d\n\021GqlQueryParameter\022+\n\005value\030\002 \001" - + "(\0132\032.google.datastore.v1.ValueH\000\022\020\n\006curs" - + "or\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020QueryRe" - + "sultBatch\022\027\n\017skipped_results\030\006 \001(\005\022\026\n\016sk" - + "ipped_cursor\030\003 \001(\014\022H\n\022entity_result_type" - + "\030\001 \001(\0162,.google.datastore.v1.EntityResul" - + "t.ResultType\0229\n\016entity_results\030\002 \003(\0132!.g" - + "oogle.datastore.v1.EntityResult\022\022\n\nend_c" - + "ursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\01625.goog" - + "le.datastore.v1.QueryResultBatch.MoreRes" - + "ultsType\022\030\n\020snapshot_version\030\007 \001(\003\022-\n\tre" - + "ad_time\030\010 \001(\0132\032.google.protobuf.Timestam" - + "p\"\230\001\n\017MoreResultsType\022!\n\035MORE_RESULTS_TY" - + "PE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MO" - + "RE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESULTS" - + "_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\274\001\n" - + "\027com.google.datastore.v1B\nQueryProtoP\001Z<" - + "google.golang.org/genproto/googleapis/da" - + "tastore/v1;datastore\252\002\031Google.Cloud.Data" - + "store.V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002\034G" - + "oogle::Cloud::Datastore::V1b\006proto3" + + "google.protobuf.Int32Value\"\326\002\n\020Aggregati" + + "onQuery\0222\n\014nested_query\030\001 \001(\0132\032.google.d" + + "atastore.v1.QueryH\000\022L\n\014aggregations\030\003 \003(" + + "\01321.google.datastore.v1.AggregationQuery" + + ".AggregationB\003\340A\001\032\261\001\n\013Aggregation\022H\n\005cou" + + "nt\030\001 \001(\01327.google.datastore.v1.Aggregati" + + "onQuery.Aggregation.CountH\000\022\022\n\005alias\030\007 \001" + + "(\tB\003\340A\001\0328\n\005Count\022/\n\005up_to\030\001 \001(\0132\033.google" + + ".protobuf.Int64ValueB\003\340A\001B\n\n\010operatorB\014\n" + + "\nquery_type\"\036\n\016KindExpression\022\014\n\004name\030\001 " + + "\001(\t\"!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F" + + "\n\nProjection\0228\n\010property\030\001 \001(\0132&.google." + + "datastore.v1.PropertyReference\"\321\001\n\rPrope" + + "rtyOrder\0228\n\010property\030\001 \001(\0132&.google.data" + + "store.v1.PropertyReference\022?\n\tdirection\030" + + "\002 \001(\0162,.google.datastore.v1.PropertyOrde" + + "r.Direction\"E\n\tDirection\022\031\n\025DIRECTION_UN" + + "SPECIFIED\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" + + "$.google.datastore.v1.CompositeFilterH\000\022" + + ">\n\017property_filter\030\002 \001(\0132#.google.datast" + + "ore.v1.PropertyFilterH\000B\r\n\013filter_type\"\251" + + "\001\n\017CompositeFilter\0229\n\002op\030\001 \001(\0162-.google." + + "datastore.v1.CompositeFilter.Operator\022,\n" + + "\007filters\030\002 \003(\0132\033.google.datastore.v1.Fil" + + "ter\"-\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED\020" + + "\000\022\007\n\003AND\020\001\"\352\002\n\016PropertyFilter\0228\n\010propert" + + "y\030\001 \001(\0132&.google.datastore.v1.PropertyRe" + + "ference\0228\n\002op\030\002 \001(\0162,.google.datastore.v" + + "1.PropertyFilter.Operator\022)\n\005value\030\003 \001(\013" + + "2\032.google.datastore.v1.Value\"\270\001\n\010Operato" + + "r\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_TH" + + "AN\020\003\022\031\n\025GREATER_THAN_OR_EQUAL\020\004\022\t\n\005EQUAL" + + "\020\005\022\006\n\002IN\020\006\022\r\n\tNOT_EQUAL\020\t\022\020\n\014HAS_ANCESTO" + + "R\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010GqlQuery\022\024\n\014query_st" + + "ring\030\001 \001(\t\022\026\n\016allow_literals\030\002 \001(\010\022H\n\016na" + + "med_bindings\030\005 \003(\01320.google.datastore.v1" + + ".GqlQuery.NamedBindingsEntry\022C\n\023position" + + "al_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.dat" + + "astore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQu" + + "eryParameter\022+\n\005value\030\002 \001(\0132\032.google.dat" + + "astore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016p" + + "arameter_type\"\215\004\n\020QueryResultBatch\022\027\n\017sk" + + "ipped_results\030\006 \001(\005\022\026\n\016skipped_cursor\030\003 " + + "\001(\014\022H\n\022entity_result_type\030\001 \001(\0162,.google" + + ".datastore.v1.EntityResult.ResultType\0229\n" + + "\016entity_results\030\002 \003(\0132!.google.datastore" + + ".v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n\014" + + "more_results\030\005 \001(\01625.google.datastore.v1" + + ".QueryResultBatch.MoreResultsType\022\030\n\020sna" + + "pshot_version\030\007 \001(\003\022-\n\tread_time\030\010 \001(\0132\032" + + ".google.protobuf.Timestamp\"\230\001\n\017MoreResul" + + "tsType\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020" + + "\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MORE_RESULTS_AFTE" + + "R_LIMIT\020\002\022\035\n\031MORE_RESULTS_AFTER_CURSOR\020\004" + + "\022\023\n\017NO_MORE_RESULTS\020\003B\274\001\n\027com.google.dat" + + "astore.v1B\nQueryProtoP\001Z(); - 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; - } - case 40: - { - int rawValue = input.readEnum(); - - moreResults_ = rawValue; - break; - } - case 48: - { - skippedResults_ = input.readInt32(); - break; - } - case 56: - { - snapshotVersion_ = input.readInt64(); - break; - } - case 66: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (readTime_ != null) { - subBuilder = readTime_.toBuilder(); - } - readTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(readTime_); - readTime_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - entityResults_ = java.util.Collections.unmodifiableList(entityResults_); - } - 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_QueryResultBatch_descriptor; @@ -713,7 +610,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (readTime_ != null) { output.writeMessage(8, getReadTime()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -749,7 +646,7 @@ public int getSerializedSize() { if (readTime_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getReadTime()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -775,7 +672,7 @@ public boolean equals(final java.lang.Object obj) { if (hasReadTime()) { if (!getReadTime().equals(other.getReadTime())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -806,7 +703,7 @@ public int hashCode() { hash = (37 * hash) + READ_TIME_FIELD_NUMBER; hash = (53 * hash) + getReadTime().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -935,19 +832,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.QueryResultBatch.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getEntityResultsFieldBuilder(); - } } @java.lang.Override @@ -961,10 +849,11 @@ public Builder clear() { if (entityResultsBuilder_ == null) { entityResults_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + entityResults_ = null; entityResultsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); endCursor_ = com.google.protobuf.ByteString.EMPTY; moreResults_ = 0; @@ -1122,7 +1011,7 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) { if (other.hasReadTime()) { mergeReadTime(other.getReadTime()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1137,17 +1026,86 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.QueryResultBatch parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + entityResultType_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + com.google.datastore.v1.EntityResult m = + input.readMessage( + com.google.datastore.v1.EntityResult.parser(), extensionRegistry); + if (entityResultsBuilder_ == null) { + ensureEntityResultsIsMutable(); + entityResults_.add(m); + } else { + entityResultsBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + skippedCursor_ = input.readBytes(); + + break; + } // case 26 + case 34: + { + endCursor_ = input.readBytes(); + + break; + } // case 34 + case 40: + { + moreResults_ = input.readEnum(); + + break; + } // case 40 + case 48: + { + skippedResults_ = input.readInt32(); + + break; + } // case 48 + case 56: + { + snapshotVersion_ = input.readInt64(); + + break; + } // case 56 + case 66: + { + input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 66 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.QueryResultBatch) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2211,7 +2169,18 @@ public QueryResultBatch parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new QueryResultBatch(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 4a0035eac..6e3f179a6 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 @@ -50,73 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ReadOptions( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - consistencyTypeCase_ = 1; - consistencyType_ = rawValue; - break; - } - case 18: - { - consistencyType_ = input.readBytes(); - consistencyTypeCase_ = 2; - break; - } - case 34: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (consistencyTypeCase_ == 4) { - subBuilder = ((com.google.protobuf.Timestamp) consistencyType_).toBuilder(); - } - consistencyType_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.protobuf.Timestamp) consistencyType_); - consistencyType_ = subBuilder.buildPartial(); - } - consistencyTypeCase_ = 4; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -516,7 +449,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (consistencyTypeCase_ == 4) { output.writeMessage(4, (com.google.protobuf.Timestamp) consistencyType_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -540,7 +473,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 4, (com.google.protobuf.Timestamp) consistencyType_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -569,7 +502,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -596,7 +529,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -724,22 +657,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.ReadOptions.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override public Builder clear() { super.clear(); + if (readTimeBuilder_ != null) { + readTimeBuilder_.clear(); + } consistencyTypeCase_ = 0; consistencyType_ = null; return this; @@ -852,7 +781,7 @@ public Builder mergeFrom(com.google.datastore.v1.ReadOptions other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -867,17 +796,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.ReadOptions parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + int rawValue = input.readEnum(); + consistencyTypeCase_ = 1; + consistencyType_ = rawValue; + break; + } // case 8 + case 18: + { + consistencyType_ = input.readBytes(); + consistencyTypeCase_ = 2; + break; + } // case 18 + case 34: + { + input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry); + consistencyTypeCase_ = 4; + break; + } // case 34 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.ReadOptions) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1350,7 +1312,18 @@ public ReadOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadOptions(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 7a8ce32c3..06a6b146c 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 @@ -54,72 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ReserveIdsRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 66: - { - 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; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - keys_ = java.util.Collections.unmodifiableList(keys_); - } - 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_ReserveIdsRequest_descriptor; @@ -338,7 +272,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -356,7 +290,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -375,7 +309,7 @@ public boolean equals(final java.lang.Object obj) { 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; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -394,7 +328,7 @@ public int hashCode() { hash = (37 * hash) + KEYS_FIELD_NUMBER; hash = (53 * hash) + getKeysList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -523,19 +457,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.ReserveIdsRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getKeysFieldBuilder(); - } } @java.lang.Override @@ -547,10 +472,11 @@ public Builder clear() { if (keysBuilder_ == null) { keys_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + keys_ = null; keysBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -674,7 +600,7 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -689,17 +615,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.ReserveIdsRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.datastore.v1.Key m = + input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry); + if (keysBuilder_ == null) { + ensureKeysIsMutable(); + keys_.add(m); + } else { + keysBuilder_.addMessage(m); + } + break; + } // case 10 + case 66: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 66 + case 74: + { + databaseId_ = input.readStringRequireUtf8(); + + break; + } // case 74 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.ReserveIdsRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1337,7 +1301,18 @@ public ReserveIdsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReserveIdsRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 b889a46f1..6a3398d4d 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 @@ -50,45 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ReserveIdsResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -118,7 +79,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -127,7 +88,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -143,7 +104,7 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.ReserveIdsResponse other = (com.google.datastore.v1.ReserveIdsResponse) obj; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -154,7 +115,7 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -283,17 +244,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.ReserveIdsResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -375,7 +329,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.datastore.v1.ReserveIdsResponse other) { if (other == com.google.datastore.v1.ReserveIdsResponse.getDefaultInstance()) return this; - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -390,17 +344,31 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.ReserveIdsResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.ReserveIdsResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -436,7 +404,18 @@ public ReserveIdsResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReserveIdsResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 f964889bf..91c084b4b 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 @@ -54,64 +54,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RollbackRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - transaction_ = input.readBytes(); - break; - } - case 66: - { - 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; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -271,7 +213,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -289,7 +231,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -307,7 +249,7 @@ public boolean equals(final java.lang.Object obj) { if (!getProjectId().equals(other.getProjectId())) return false; if (!getDatabaseId().equals(other.getDatabaseId())) return false; if (!getTransaction().equals(other.getTransaction())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -324,7 +266,7 @@ public int hashCode() { hash = (53 * hash) + getDatabaseId().hashCode(); hash = (37 * hash) + TRANSACTION_FIELD_NUMBER; hash = (53 * hash) + getTransaction().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -453,17 +395,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.RollbackRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -565,7 +500,7 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackRequest other) { if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) { setTransaction(other.getTransaction()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -580,17 +515,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.RollbackRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + transaction_ = input.readBytes(); + + break; + } // case 10 + case 66: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 66 + case 74: + { + databaseId_ = input.readStringRequireUtf8(); + + break; + } // case 74 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.RollbackRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -906,7 +873,18 @@ public RollbackRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RollbackRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 0d96f1969..43e61c469 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 @@ -51,45 +51,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RollbackResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -119,7 +80,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -128,7 +89,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -143,7 +104,7 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.RollbackResponse other = (com.google.datastore.v1.RollbackResponse) obj; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -154,7 +115,7 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -284,17 +245,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.RollbackResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -376,7 +330,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.datastore.v1.RollbackResponse other) { if (other == com.google.datastore.v1.RollbackResponse.getDefaultInstance()) return this; - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -391,17 +345,31 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.RollbackResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.RollbackResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -437,7 +405,18 @@ public RollbackResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RollbackResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java new file mode 100644 index 000000000..690015e93 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java @@ -0,0 +1,2048 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * + * + * 
+ * The request for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+ *
+ * + * Protobuf type {@code google.datastore.v1.RunAggregationQueryRequest} + */ +public final class RunAggregationQueryRequest extends com.google.protobuf.GeneratedMessageV3 + implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.RunAggregationQueryRequest) + RunAggregationQueryRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use RunAggregationQueryRequest.newBuilder() to construct. + private RunAggregationQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + + private RunAggregationQueryRequest() { + projectId_ = ""; + databaseId_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new RunAggregationQueryRequest(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + return this.unknownFields; + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_RunAggregationQueryRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_RunAggregationQueryRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RunAggregationQueryRequest.class, + com.google.datastore.v1.RunAggregationQueryRequest.Builder.class); + } + + private int queryTypeCase_ = 0; + private java.lang.Object queryType_; + + public enum QueryTypeCase + implements + com.google.protobuf.Internal.EnumLite, + com.google.protobuf.AbstractMessage.InternalOneOfEnum { + AGGREGATION_QUERY(3), + GQL_QUERY(7), + QUERYTYPE_NOT_SET(0); + private final int value; + + private QueryTypeCase(int value) { + this.value = value; + } + /** + * @param value The number of the enum to look for. + * @return The enum associated with the given number. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static QueryTypeCase valueOf(int value) { + return forNumber(value); + } + + public static QueryTypeCase forNumber(int value) { + switch (value) { + case 3: + return AGGREGATION_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 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. + */ + @java.lang.Override + public java.lang.String getProjectId() { + java.lang.Object ref = projectId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + 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. + */ + @java.lang.Override + 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); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int DATABASE_ID_FIELD_NUMBER = 9; + private volatile java.lang.Object databaseId_; + /** + * + * + * 
+   * The ID of the database against which to make the request.
+   * '(default)' is not allowed; please use empty string '' to refer the default
+   * database.
+   *
+ * + * string database_id = 9; + * + * @return The databaseId. + */ + @java.lang.Override + public java.lang.String getDatabaseId() { + java.lang.Object ref = databaseId_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + databaseId_ = s; + return s; + } + } + /** + * + * + * 
+   * The ID of the database against which to make the request.
+   * '(default)' is not allowed; please use empty string '' to refer the default
+   * database.
+   *
+ * + * string database_id = 9; + * + * @return The bytes for databaseId. + */ + @java.lang.Override + 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); + databaseId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + 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.
+   * This partition ID is normalized with the standard default context
+   * partition ID.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + * + * @return Whether the partitionId field is set. + */ + @java.lang.Override + public boolean hasPartitionId() { + return partitionId_ != null; + } + /** + * + * + * 
+   * Entities are partitioned into subsets, identified by a partition ID.
+   * Queries are scoped to a single partition.
+   * This partition ID is normalized with the standard default context
+   * partition ID.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + * + * @return The partitionId. + */ + @java.lang.Override + public com.google.datastore.v1.PartitionId getPartitionId() { + 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.
+   * This partition ID is normalized with the standard default context
+   * partition ID.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + @java.lang.Override + public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { + return getPartitionId(); + } + + 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. + */ + @java.lang.Override + public boolean hasReadOptions() { + return readOptions_ != null; + } + /** + * + * + * 
+   * The options for this query.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + * + * @return The readOptions. + */ + @java.lang.Override + public com.google.datastore.v1.ReadOptions getReadOptions() { + return readOptions_ == null + ? com.google.datastore.v1.ReadOptions.getDefaultInstance() + : readOptions_; + } + /** + * + * + * 
+   * The options for this query.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + @java.lang.Override + public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { + return getReadOptions(); + } + + public static final int AGGREGATION_QUERY_FIELD_NUMBER = 3; + /** + * + * + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + * + * @return Whether the aggregationQuery field is set. + */ + @java.lang.Override + public boolean hasAggregationQuery() { + return queryTypeCase_ == 3; + } + /** + * + * + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + * + * @return The aggregationQuery. + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQuery getAggregationQuery() { + if (queryTypeCase_ == 3) { + return (com.google.datastore.v1.AggregationQuery) queryType_; + } + return com.google.datastore.v1.AggregationQuery.getDefaultInstance(); + } + /** + * + * + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBuilder() { + if (queryTypeCase_ == 3) { + return (com.google.datastore.v1.AggregationQuery) queryType_; + } + return com.google.datastore.v1.AggregationQuery.getDefaultInstance(); + } + + public static final int GQL_QUERY_FIELD_NUMBER = 7; + /** + * + * + * 
+   * The GQL query to run. This query must be an aggregation query.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + * + * @return Whether the gqlQuery field is set. + */ + @java.lang.Override + public boolean hasGqlQuery() { + return queryTypeCase_ == 7; + } + /** + * + * + * 
+   * The GQL query to run. This query must be an aggregation query.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + * + * @return The gqlQuery. + */ + @java.lang.Override + public com.google.datastore.v1.GqlQuery getGqlQuery() { + if (queryTypeCase_ == 7) { + return (com.google.datastore.v1.GqlQuery) queryType_; + } + return com.google.datastore.v1.GqlQuery.getDefaultInstance(); + } + /** + * + * + * 
+   * The GQL query to run. This query must be an aggregation query.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + @java.lang.Override + public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { + if (queryTypeCase_ == 7) { + 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; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (readOptions_ != null) { + output.writeMessage(1, getReadOptions()); + } + if (partitionId_ != null) { + output.writeMessage(2, getPartitionId()); + } + if (queryTypeCase_ == 3) { + output.writeMessage(3, (com.google.datastore.v1.AggregationQuery) queryType_); + } + if (queryTypeCase_ == 7) { + output.writeMessage(7, (com.google.datastore.v1.GqlQuery) queryType_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (readOptions_ != null) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadOptions()); + } + if (partitionId_ != null) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPartitionId()); + } + if (queryTypeCase_ == 3) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize( + 3, (com.google.datastore.v1.AggregationQuery) queryType_); + } + if (queryTypeCase_ == 7) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize( + 7, (com.google.datastore.v1.GqlQuery) queryType_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.RunAggregationQueryRequest)) { + return super.equals(obj); + } + com.google.datastore.v1.RunAggregationQueryRequest other = + (com.google.datastore.v1.RunAggregationQueryRequest) obj; + + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getDatabaseId().equals(other.getDatabaseId())) return false; + if (hasPartitionId() != other.hasPartitionId()) return false; + if (hasPartitionId()) { + if (!getPartitionId().equals(other.getPartitionId())) return false; + } + if (hasReadOptions() != other.hasReadOptions()) return false; + if (hasReadOptions()) { + if (!getReadOptions().equals(other.getReadOptions())) return false; + } + if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false; + switch (queryTypeCase_) { + case 3: + if (!getAggregationQuery().equals(other.getAggregationQuery())) return false; + break; + case 7: + if (!getGqlQuery().equals(other.getGqlQuery())) return false; + break; + case 0: + default: + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER; + hash = (53 * hash) + getProjectId().hashCode(); + hash = (37 * hash) + DATABASE_ID_FIELD_NUMBER; + hash = (53 * hash) + getDatabaseId().hashCode(); + if (hasPartitionId()) { + hash = (37 * hash) + PARTITION_ID_FIELD_NUMBER; + hash = (53 * hash) + getPartitionId().hashCode(); + } + if (hasReadOptions()) { + hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER; + hash = (53 * hash) + getReadOptions().hashCode(); + } + switch (queryTypeCase_) { + case 3: + hash = (37 * hash) + AGGREGATION_QUERY_FIELD_NUMBER; + hash = (53 * hash) + getAggregationQuery().hashCode(); + break; + case 7: + hash = (37 * hash) + GQL_QUERY_FIELD_NUMBER; + hash = (53 * hash) + getGqlQuery().hashCode(); + break; + case 0: + default: + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom( + java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom( + 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.RunAggregationQueryRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.RunAggregationQueryRequest 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.RunAggregationQueryRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.RunAggregationQueryRequest parseDelimitedFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.RunAggregationQueryRequest parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.RunAggregationQueryRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(com.google.datastore.v1.RunAggregationQueryRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * + * + * 
+   * The request for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+   *
+ * + * Protobuf type {@code google.datastore.v1.RunAggregationQueryRequest} + */ + public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder + implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.RunAggregationQueryRequest) + com.google.datastore.v1.RunAggregationQueryRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_RunAggregationQueryRequest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_RunAggregationQueryRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RunAggregationQueryRequest.class, + com.google.datastore.v1.RunAggregationQueryRequest.Builder.class); + } + + // Construct using com.google.datastore.v1.RunAggregationQueryRequest.newBuilder() + private Builder() {} + + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + } + + @java.lang.Override + public Builder clear() { + super.clear(); + projectId_ = ""; + + databaseId_ = ""; + + if (partitionIdBuilder_ == null) { + partitionId_ = null; + } else { + partitionId_ = null; + partitionIdBuilder_ = null; + } + if (readOptionsBuilder_ == null) { + readOptions_ = null; + } else { + readOptions_ = null; + readOptionsBuilder_ = null; + } + if (aggregationQueryBuilder_ != null) { + aggregationQueryBuilder_.clear(); + } + if (gqlQueryBuilder_ != null) { + gqlQueryBuilder_.clear(); + } + queryTypeCase_ = 0; + queryType_ = null; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_RunAggregationQueryRequest_descriptor; + } + + @java.lang.Override + public com.google.datastore.v1.RunAggregationQueryRequest getDefaultInstanceForType() { + return com.google.datastore.v1.RunAggregationQueryRequest.getDefaultInstance(); + } + + @java.lang.Override + public com.google.datastore.v1.RunAggregationQueryRequest build() { + com.google.datastore.v1.RunAggregationQueryRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.datastore.v1.RunAggregationQueryRequest buildPartial() { + com.google.datastore.v1.RunAggregationQueryRequest result = + new com.google.datastore.v1.RunAggregationQueryRequest(this); + result.projectId_ = projectId_; + result.databaseId_ = databaseId_; + if (partitionIdBuilder_ == null) { + result.partitionId_ = partitionId_; + } else { + result.partitionId_ = partitionIdBuilder_.build(); + } + if (readOptionsBuilder_ == null) { + result.readOptions_ = readOptions_; + } else { + result.readOptions_ = readOptionsBuilder_.build(); + } + if (queryTypeCase_ == 3) { + if (aggregationQueryBuilder_ == null) { + result.queryType_ = queryType_; + } else { + result.queryType_ = aggregationQueryBuilder_.build(); + } + } + if (queryTypeCase_ == 7) { + if (gqlQueryBuilder_ == null) { + result.queryType_ = queryType_; + } else { + result.queryType_ = gqlQueryBuilder_.build(); + } + } + result.queryTypeCase_ = queryTypeCase_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + + @java.lang.Override + public Builder setField( + 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) { + return super.clearField(field); + } + + @java.lang.Override + 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) { + return super.setRepeatedField(field, index, value); + } + + @java.lang.Override + public Builder addRepeatedField( + 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.RunAggregationQueryRequest) { + return mergeFrom((com.google.datastore.v1.RunAggregationQueryRequest) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryRequest other) { + if (other == com.google.datastore.v1.RunAggregationQueryRequest.getDefaultInstance()) + return this; + if (!other.getProjectId().isEmpty()) { + projectId_ = other.projectId_; + onChanged(); + } + if (!other.getDatabaseId().isEmpty()) { + databaseId_ = other.databaseId_; + onChanged(); + } + if (other.hasPartitionId()) { + mergePartitionId(other.getPartitionId()); + } + if (other.hasReadOptions()) { + mergeReadOptions(other.getReadOptions()); + } + switch (other.getQueryTypeCase()) { + case AGGREGATION_QUERY: + { + mergeAggregationQuery(other.getAggregationQuery()); + break; + } + case GQL_QUERY: + { + mergeGqlQuery(other.getGqlQuery()); + break; + } + case QUERYTYPE_NOT_SET: + { + break; + } + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getPartitionIdFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage( + getAggregationQueryFieldBuilder().getBuilder(), extensionRegistry); + queryTypeCase_ = 3; + break; + } // case 26 + case 58: + { + input.readMessage(getGqlQueryFieldBuilder().getBuilder(), extensionRegistry); + queryTypeCase_ = 7; + break; + } // case 58 + case 66: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 66 + case 74: + { + databaseId_ = input.readStringRequireUtf8(); + + break; + } // case 74 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private int queryTypeCase_ = 0; + private java.lang.Object queryType_; + + public QueryTypeCase getQueryTypeCase() { + return QueryTypeCase.forNumber(queryTypeCase_); + } + + public Builder clearQueryType() { + queryTypeCase_ = 0; + queryType_ = null; + onChanged(); + 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; + java.lang.String s = bs.toStringUtf8(); + projectId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + * 
+     * 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() { + java.lang.Object ref = projectId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + projectId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + * 
+     * 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) { + if (value == null) { + 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) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + projectId_ = value; + onChanged(); + return this; + } + + private java.lang.Object databaseId_ = ""; + /** + * + * + * 
+     * The ID of the database against which to make the request.
+     * '(default)' is not allowed; please use empty string '' to refer the default
+     * database.
+     *
+ * + * 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; + java.lang.String s = bs.toStringUtf8(); + databaseId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + * 
+     * The ID of the database against which to make the request.
+     * '(default)' is not allowed; please use empty string '' to refer the default
+     * database.
+     *
+ * + * string database_id = 9; + * + * @return The bytes for databaseId. + */ + 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); + databaseId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + * 
+     * The ID of the database against which to make the request.
+     * '(default)' is not allowed; please use empty string '' to refer the default
+     * database.
+     *
+ * + * string database_id = 9; + * + * @param value The databaseId to set. + * @return This builder for chaining. + */ + public Builder setDatabaseId(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + databaseId_ = value; + onChanged(); + return this; + } + /** + * + * + * 
+     * The ID of the database against which to make the request.
+     * '(default)' is not allowed; please use empty string '' to refer the default
+     * database.
+     *
+ * + * string database_id = 9; + * + * @return This builder for chaining. + */ + public Builder clearDatabaseId() { + + databaseId_ = getDefaultInstance().getDatabaseId(); + onChanged(); + return this; + } + /** + * + * + * 
+     * The ID of the database against which to make the request.
+     * '(default)' is not allowed; please use empty string '' to refer the default
+     * database.
+     *
+ * + * 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) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + databaseId_ = value; + onChanged(); + return this; + } + + 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_; + /** + * + * + * 
+     * Entities are partitioned into subsets, identified by a partition ID.
+     * Queries are scoped to a single partition.
+     * This partition ID is normalized with the standard default context
+     * partition ID.
+     *
+ * + * .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.
+     * This partition ID is normalized with the standard default context
+     * partition ID.
+     *
+ * + * .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_; + } else { + return partitionIdBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * Entities are partitioned into subsets, identified by a partition ID.
+     * Queries are scoped to a single partition.
+     * This partition ID is normalized with the standard default context
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public Builder setPartitionId(com.google.datastore.v1.PartitionId value) { + if (partitionIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + partitionId_ = value; + onChanged(); + } else { + partitionIdBuilder_.setMessage(value); + } + + return this; + } + /** + * + * + * 
+     * Entities are partitioned into subsets, identified by a partition ID.
+     * Queries are scoped to a single partition.
+     * This partition ID is normalized with the standard default context
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public Builder setPartitionId(com.google.datastore.v1.PartitionId.Builder builderForValue) { + if (partitionIdBuilder_ == null) { + partitionId_ = builderForValue.build(); + onChanged(); + } else { + partitionIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * + * + * 
+     * Entities are partitioned into subsets, identified by a partition ID.
+     * Queries are scoped to a single partition.
+     * This partition ID is normalized with the standard default context
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + 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(); + } else { + partitionId_ = value; + } + onChanged(); + } else { + partitionIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * + * + * 
+     * Entities are partitioned into subsets, identified by a partition ID.
+     * Queries are scoped to a single partition.
+     * This partition ID is normalized with the standard default context
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public Builder clearPartitionId() { + if (partitionIdBuilder_ == null) { + partitionId_ = null; + onChanged(); + } else { + partitionId_ = null; + partitionIdBuilder_ = null; + } + + return this; + } + /** + * + * + * 
+     * Entities are partitioned into subsets, identified by a partition ID.
+     * Queries are scoped to a single partition.
+     * This partition ID is normalized with the standard default context
+     * partition ID.
+     *
+ * + * .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.
+     * This partition ID is normalized with the standard default context
+     * partition ID.
+     *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { + if (partitionIdBuilder_ != null) { + return partitionIdBuilder_.getMessageOrBuilder(); + } else { + 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.
+     * This partition ID is normalized with the standard default context
+     * partition ID.
+     *
+ * + * .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> + 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()); + partitionId_ = null; + } + return partitionIdBuilder_; + } + + 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_; + /** + * + * + * 
+     * 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_; + } else { + return readOptionsBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public Builder setReadOptions(com.google.datastore.v1.ReadOptions value) { + if (readOptionsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + readOptions_ = value; + onChanged(); + } else { + readOptionsBuilder_.setMessage(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) { + if (readOptionsBuilder_ == null) { + readOptions_ = builderForValue.build(); + onChanged(); + } else { + readOptionsBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * + * + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + 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(); + } else { + readOptions_ = value; + } + onChanged(); + } else { + readOptionsBuilder_.mergeFrom(value); + } + + return this; + } + /** + * + * + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public Builder clearReadOptions() { + if (readOptionsBuilder_ == null) { + readOptions_ = null; + onChanged(); + } else { + readOptions_ = null; + readOptionsBuilder_ = null; + } + + return this; + } + /** + * + * + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptions.Builder getReadOptionsBuilder() { + + onChanged(); + return getReadOptionsFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * The options for this query.
+     *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { + if (readOptionsBuilder_ != null) { + return readOptionsBuilder_.getMessageOrBuilder(); + } else { + return readOptions_ == null + ? com.google.datastore.v1.ReadOptions.getDefaultInstance() + : readOptions_; + } + } + /** + * + * + * 
+     * The options for this query.
+     *
+ * + * .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> + 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()); + readOptions_ = null; + } + return readOptionsBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationQuery, + com.google.datastore.v1.AggregationQuery.Builder, + com.google.datastore.v1.AggregationQueryOrBuilder> + aggregationQueryBuilder_; + /** + * + * + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + * + * @return Whether the aggregationQuery field is set. + */ + @java.lang.Override + public boolean hasAggregationQuery() { + return queryTypeCase_ == 3; + } + /** + * + * + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + * + * @return The aggregationQuery. + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQuery getAggregationQuery() { + if (aggregationQueryBuilder_ == null) { + if (queryTypeCase_ == 3) { + return (com.google.datastore.v1.AggregationQuery) queryType_; + } + return com.google.datastore.v1.AggregationQuery.getDefaultInstance(); + } else { + if (queryTypeCase_ == 3) { + return aggregationQueryBuilder_.getMessage(); + } + return com.google.datastore.v1.AggregationQuery.getDefaultInstance(); + } + } + /** + * + * + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + */ + public Builder setAggregationQuery(com.google.datastore.v1.AggregationQuery value) { + if (aggregationQueryBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + queryType_ = value; + onChanged(); + } else { + aggregationQueryBuilder_.setMessage(value); + } + queryTypeCase_ = 3; + return this; + } + /** + * + * + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + */ + public Builder setAggregationQuery( + com.google.datastore.v1.AggregationQuery.Builder builderForValue) { + if (aggregationQueryBuilder_ == null) { + queryType_ = builderForValue.build(); + onChanged(); + } else { + aggregationQueryBuilder_.setMessage(builderForValue.build()); + } + queryTypeCase_ = 3; + return this; + } + /** + * + * + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + */ + public Builder mergeAggregationQuery(com.google.datastore.v1.AggregationQuery value) { + if (aggregationQueryBuilder_ == null) { + if (queryTypeCase_ == 3 + && queryType_ != com.google.datastore.v1.AggregationQuery.getDefaultInstance()) { + queryType_ = + com.google.datastore.v1.AggregationQuery.newBuilder( + (com.google.datastore.v1.AggregationQuery) queryType_) + .mergeFrom(value) + .buildPartial(); + } else { + queryType_ = value; + } + onChanged(); + } else { + if (queryTypeCase_ == 3) { + aggregationQueryBuilder_.mergeFrom(value); + } else { + aggregationQueryBuilder_.setMessage(value); + } + } + queryTypeCase_ = 3; + return this; + } + /** + * + * + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + */ + public Builder clearAggregationQuery() { + if (aggregationQueryBuilder_ == null) { + if (queryTypeCase_ == 3) { + queryTypeCase_ = 0; + queryType_ = null; + onChanged(); + } + } else { + if (queryTypeCase_ == 3) { + queryTypeCase_ = 0; + queryType_ = null; + } + aggregationQueryBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + */ + public com.google.datastore.v1.AggregationQuery.Builder getAggregationQueryBuilder() { + return getAggregationQueryFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBuilder() { + if ((queryTypeCase_ == 3) && (aggregationQueryBuilder_ != null)) { + return aggregationQueryBuilder_.getMessageOrBuilder(); + } else { + if (queryTypeCase_ == 3) { + return (com.google.datastore.v1.AggregationQuery) queryType_; + } + return com.google.datastore.v1.AggregationQuery.getDefaultInstance(); + } + } + /** + * + * + * 
+     * The query to run.
+     *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationQuery, + com.google.datastore.v1.AggregationQuery.Builder, + com.google.datastore.v1.AggregationQueryOrBuilder> + getAggregationQueryFieldBuilder() { + if (aggregationQueryBuilder_ == null) { + if (!(queryTypeCase_ == 3)) { + queryType_ = com.google.datastore.v1.AggregationQuery.getDefaultInstance(); + } + aggregationQueryBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationQuery, + com.google.datastore.v1.AggregationQuery.Builder, + com.google.datastore.v1.AggregationQueryOrBuilder>( + (com.google.datastore.v1.AggregationQuery) queryType_, + getParentForChildren(), + isClean()); + queryType_ = null; + } + queryTypeCase_ = 3; + onChanged(); + ; + return aggregationQueryBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.GqlQuery, + com.google.datastore.v1.GqlQuery.Builder, + com.google.datastore.v1.GqlQueryOrBuilder> + gqlQueryBuilder_; + /** + * + * + * 
+     * The GQL query to run. This query must be an aggregation query.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + * + * @return Whether the gqlQuery field is set. + */ + @java.lang.Override + public boolean hasGqlQuery() { + return queryTypeCase_ == 7; + } + /** + * + * + * 
+     * The GQL query to run. This query must be an aggregation query.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + * + * @return The gqlQuery. + */ + @java.lang.Override + public com.google.datastore.v1.GqlQuery getGqlQuery() { + if (gqlQueryBuilder_ == null) { + if (queryTypeCase_ == 7) { + return (com.google.datastore.v1.GqlQuery) queryType_; + } + return com.google.datastore.v1.GqlQuery.getDefaultInstance(); + } else { + if (queryTypeCase_ == 7) { + return gqlQueryBuilder_.getMessage(); + } + return com.google.datastore.v1.GqlQuery.getDefaultInstance(); + } + } + /** + * + * + * 
+     * The GQL query to run. This query must be an aggregation query.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public Builder setGqlQuery(com.google.datastore.v1.GqlQuery value) { + if (gqlQueryBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + queryType_ = value; + onChanged(); + } else { + gqlQueryBuilder_.setMessage(value); + } + queryTypeCase_ = 7; + return this; + } + /** + * + * + * 
+     * The GQL query to run. This query must be an aggregation query.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForValue) { + if (gqlQueryBuilder_ == null) { + queryType_ = builderForValue.build(); + onChanged(); + } else { + gqlQueryBuilder_.setMessage(builderForValue.build()); + } + queryTypeCase_ = 7; + return this; + } + /** + * + * + * 
+     * The GQL query to run. This query must be an aggregation query.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + 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(); + } else { + queryType_ = value; + } + onChanged(); + } else { + if (queryTypeCase_ == 7) { + gqlQueryBuilder_.mergeFrom(value); + } else { + gqlQueryBuilder_.setMessage(value); + } + } + queryTypeCase_ = 7; + return this; + } + /** + * + * + * 
+     * The GQL query to run. This query must be an aggregation query.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public Builder clearGqlQuery() { + if (gqlQueryBuilder_ == null) { + if (queryTypeCase_ == 7) { + queryTypeCase_ = 0; + queryType_ = null; + onChanged(); + } + } else { + if (queryTypeCase_ == 7) { + queryTypeCase_ = 0; + queryType_ = null; + } + gqlQueryBuilder_.clear(); + } + return this; + } + /** + * + * + * 
+     * The GQL query to run. This query must be an aggregation query.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() { + return getGqlQueryFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * The GQL query to run. This query must be an aggregation query.
+     *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + @java.lang.Override + public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { + if ((queryTypeCase_ == 7) && (gqlQueryBuilder_ != null)) { + return gqlQueryBuilder_.getMessageOrBuilder(); + } else { + if (queryTypeCase_ == 7) { + return (com.google.datastore.v1.GqlQuery) queryType_; + } + return com.google.datastore.v1.GqlQuery.getDefaultInstance(); + } + } + /** + * + * + * 
+     * The GQL query to run. This query must be an aggregation query.
+     *
+ * + * .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> + 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()); + queryType_ = null; + } + queryTypeCase_ = 7; + onChanged(); + ; + return gqlQueryBuilder_; + } + + @java.lang.Override + public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.RunAggregationQueryRequest) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.RunAggregationQueryRequest) + private static final com.google.datastore.v1.RunAggregationQueryRequest DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.RunAggregationQueryRequest(); + } + + public static com.google.datastore.v1.RunAggregationQueryRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public RunAggregationQueryRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.datastore.v1.RunAggregationQueryRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java new file mode 100644 index 000000000..63ace7ed3 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java @@ -0,0 +1,230 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface RunAggregationQueryRequestOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.RunAggregationQueryRequest) + 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(); + + /** + * + * + * 
+   * The ID of the database against which to make the request.
+   * '(default)' is not allowed; please use empty string '' to refer the default
+   * database.
+   *
+ * + * string database_id = 9; + * + * @return The databaseId. + */ + java.lang.String getDatabaseId(); + /** + * + * + * 
+   * The ID of the database against which to make the request.
+   * '(default)' is not allowed; please use empty string '' to refer the default
+   * database.
+   *
+ * + * string database_id = 9; + * + * @return The bytes for databaseId. + */ + com.google.protobuf.ByteString getDatabaseIdBytes(); + + /** + * + * + * 
+   * Entities are partitioned into subsets, identified by a partition ID.
+   * Queries are scoped to a single partition.
+   * This partition ID is normalized with the standard default context
+   * partition ID.
+   *
+ * + * .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.
+   * This partition ID is normalized with the standard default context
+   * partition ID.
+   *
+ * + * .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.
+   * This partition ID is normalized with the standard default context
+   * partition ID.
+   *
+ * + * .google.datastore.v1.PartitionId partition_id = 2; + */ + 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.
+   *
+ * + * .google.datastore.v1.ReadOptions read_options = 1; + */ + com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder(); + + /** + * + * + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + * + * @return Whether the aggregationQuery field is set. + */ + boolean hasAggregationQuery(); + /** + * + * + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + * + * @return The aggregationQuery. + */ + com.google.datastore.v1.AggregationQuery getAggregationQuery(); + /** + * + * + * 
+   * The query to run.
+   *
+ * + * .google.datastore.v1.AggregationQuery aggregation_query = 3; + */ + com.google.datastore.v1.AggregationQueryOrBuilder getAggregationQueryOrBuilder(); + + /** + * + * + * 
+   * The GQL query to run. This query must be an aggregation query.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + * + * @return Whether the gqlQuery field is set. + */ + boolean hasGqlQuery(); + /** + * + * + * 
+   * The GQL query to run. This query must be an aggregation query.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + * + * @return The gqlQuery. + */ + com.google.datastore.v1.GqlQuery getGqlQuery(); + /** + * + * + * 
+   * The GQL query to run. This query must be an aggregation query.
+   *
+ * + * .google.datastore.v1.GqlQuery gql_query = 7; + */ + com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder(); + + public com.google.datastore.v1.RunAggregationQueryRequest.QueryTypeCase getQueryTypeCase(); +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java new file mode 100644 index 000000000..230d90f47 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java @@ -0,0 +1,969 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +/** + * + * + * 
+ * The response for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+ *
+ * + * Protobuf type {@code google.datastore.v1.RunAggregationQueryResponse} + */ +public final class RunAggregationQueryResponse extends com.google.protobuf.GeneratedMessageV3 + implements + // @@protoc_insertion_point(message_implements:google.datastore.v1.RunAggregationQueryResponse) + RunAggregationQueryResponseOrBuilder { + private static final long serialVersionUID = 0L; + // Use RunAggregationQueryResponse.newBuilder() to construct. + private RunAggregationQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + + private RunAggregationQueryResponse() {} + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new RunAggregationQueryResponse(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + return this.unknownFields; + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_RunAggregationQueryResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_RunAggregationQueryResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RunAggregationQueryResponse.class, + com.google.datastore.v1.RunAggregationQueryResponse.Builder.class); + } + + public static final int BATCH_FIELD_NUMBER = 1; + private com.google.datastore.v1.AggregationResultBatch batch_; + /** + * + * + * 
+   * A batch of aggregation results. Always present.
+   *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + * + * @return Whether the batch field is set. + */ + @java.lang.Override + public boolean hasBatch() { + return batch_ != null; + } + /** + * + * + * 
+   * A batch of aggregation results. Always present.
+   *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + * + * @return The batch. + */ + @java.lang.Override + public com.google.datastore.v1.AggregationResultBatch getBatch() { + return batch_ == null + ? com.google.datastore.v1.AggregationResultBatch.getDefaultInstance() + : batch_; + } + /** + * + * + * 
+   * A batch of aggregation results. Always present.
+   *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + */ + @java.lang.Override + public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder() { + return getBatch(); + } + + public static final int QUERY_FIELD_NUMBER = 2; + private com.google.datastore.v1.AggregationQuery query_; + /** + * + * + * 
+   * The parsed form of the `GqlQuery` from the request, if it was set.
+   *
+ * + * .google.datastore.v1.AggregationQuery query = 2; + * + * @return Whether the query field is set. + */ + @java.lang.Override + public boolean hasQuery() { + return query_ != null; + } + /** + * + * + * 
+   * The parsed form of the `GqlQuery` from the request, if it was set.
+   *
+ * + * .google.datastore.v1.AggregationQuery query = 2; + * + * @return The query. + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQuery getQuery() { + return query_ == null ? com.google.datastore.v1.AggregationQuery.getDefaultInstance() : query_; + } + /** + * + * + * 
+   * The parsed form of the `GqlQuery` from the request, if it was set.
+   *
+ * + * .google.datastore.v1.AggregationQuery query = 2; + */ + @java.lang.Override + public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() { + return getQuery(); + } + + private byte memoizedIsInitialized = -1; + + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (batch_ != null) { + output.writeMessage(1, getBatch()); + } + if (query_ != null) { + output.writeMessage(2, getQuery()); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (batch_ != null) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getBatch()); + } + if (query_ != null) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.google.datastore.v1.RunAggregationQueryResponse)) { + return super.equals(obj); + } + com.google.datastore.v1.RunAggregationQueryResponse other = + (com.google.datastore.v1.RunAggregationQueryResponse) obj; + + if (hasBatch() != other.hasBatch()) return false; + if (hasBatch()) { + if (!getBatch().equals(other.getBatch())) return false; + } + if (hasQuery() != other.hasQuery()) return false; + if (hasQuery()) { + if (!getQuery().equals(other.getQuery())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasBatch()) { + hash = (37 * hash) + BATCH_FIELD_NUMBER; + hash = (53 * hash) + getBatch().hashCode(); + } + if (hasQuery()) { + hash = (37 * hash) + QUERY_FIELD_NUMBER; + hash = (53 * hash) + getQuery().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom( + java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom( + 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.RunAggregationQueryResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.RunAggregationQueryResponse 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.RunAggregationQueryResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom( + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.RunAggregationQueryResponse parseDelimitedFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.RunAggregationQueryResponse parseDelimitedFrom( + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); + } + + public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + } + + public static com.google.datastore.v1.RunAggregationQueryResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { + return newBuilder(); + } + + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + + public static Builder newBuilder(com.google.datastore.v1.RunAggregationQueryResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * + * + * 
+   * The response for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery].
+   *
+ * + * Protobuf type {@code google.datastore.v1.RunAggregationQueryResponse} + */ + public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder + implements + // @@protoc_insertion_point(builder_implements:google.datastore.v1.RunAggregationQueryResponse) + com.google.datastore.v1.RunAggregationQueryResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_RunAggregationQueryResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_RunAggregationQueryResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.datastore.v1.RunAggregationQueryResponse.class, + com.google.datastore.v1.RunAggregationQueryResponse.Builder.class); + } + + // Construct using com.google.datastore.v1.RunAggregationQueryResponse.newBuilder() + private Builder() {} + + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + } + + @java.lang.Override + public Builder clear() { + super.clear(); + if (batchBuilder_ == null) { + batch_ = null; + } else { + batch_ = null; + batchBuilder_ = null; + } + if (queryBuilder_ == null) { + query_ = null; + } else { + query_ = null; + queryBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.datastore.v1.DatastoreProto + .internal_static_google_datastore_v1_RunAggregationQueryResponse_descriptor; + } + + @java.lang.Override + public com.google.datastore.v1.RunAggregationQueryResponse getDefaultInstanceForType() { + return com.google.datastore.v1.RunAggregationQueryResponse.getDefaultInstance(); + } + + @java.lang.Override + public com.google.datastore.v1.RunAggregationQueryResponse build() { + com.google.datastore.v1.RunAggregationQueryResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.datastore.v1.RunAggregationQueryResponse buildPartial() { + com.google.datastore.v1.RunAggregationQueryResponse result = + new com.google.datastore.v1.RunAggregationQueryResponse(this); + if (batchBuilder_ == null) { + result.batch_ = batch_; + } else { + result.batch_ = batchBuilder_.build(); + } + if (queryBuilder_ == null) { + result.query_ = query_; + } else { + result.query_ = queryBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + + @java.lang.Override + public Builder setField( + 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) { + return super.clearField(field); + } + + @java.lang.Override + 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) { + return super.setRepeatedField(field, index, value); + } + + @java.lang.Override + public Builder addRepeatedField( + 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.RunAggregationQueryResponse) { + return mergeFrom((com.google.datastore.v1.RunAggregationQueryResponse) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryResponse other) { + if (other == com.google.datastore.v1.RunAggregationQueryResponse.getDefaultInstance()) + return this; + if (other.hasBatch()) { + mergeBatch(other.getBatch()); + } + if (other.hasQuery()) { + mergeQuery(other.getQuery()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getBatchFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getQueryFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + + private com.google.datastore.v1.AggregationResultBatch batch_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationResultBatch, + com.google.datastore.v1.AggregationResultBatch.Builder, + com.google.datastore.v1.AggregationResultBatchOrBuilder> + batchBuilder_; + /** + * + * + * 
+     * A batch of aggregation results. Always present.
+     *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + * + * @return Whether the batch field is set. + */ + public boolean hasBatch() { + return batchBuilder_ != null || batch_ != null; + } + /** + * + * + * 
+     * A batch of aggregation results. Always present.
+     *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + * + * @return The batch. + */ + public com.google.datastore.v1.AggregationResultBatch getBatch() { + if (batchBuilder_ == null) { + return batch_ == null + ? com.google.datastore.v1.AggregationResultBatch.getDefaultInstance() + : batch_; + } else { + return batchBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * A batch of aggregation results. Always present.
+     *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + */ + public Builder setBatch(com.google.datastore.v1.AggregationResultBatch value) { + if (batchBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + batch_ = value; + onChanged(); + } else { + batchBuilder_.setMessage(value); + } + + return this; + } + /** + * + * + * 
+     * A batch of aggregation results. Always present.
+     *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + */ + public Builder setBatch( + com.google.datastore.v1.AggregationResultBatch.Builder builderForValue) { + if (batchBuilder_ == null) { + batch_ = builderForValue.build(); + onChanged(); + } else { + batchBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * + * + * 
+     * A batch of aggregation results. Always present.
+     *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + */ + public Builder mergeBatch(com.google.datastore.v1.AggregationResultBatch value) { + if (batchBuilder_ == null) { + if (batch_ != null) { + batch_ = + com.google.datastore.v1.AggregationResultBatch.newBuilder(batch_) + .mergeFrom(value) + .buildPartial(); + } else { + batch_ = value; + } + onChanged(); + } else { + batchBuilder_.mergeFrom(value); + } + + return this; + } + /** + * + * + * 
+     * A batch of aggregation results. Always present.
+     *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + */ + public Builder clearBatch() { + if (batchBuilder_ == null) { + batch_ = null; + onChanged(); + } else { + batch_ = null; + batchBuilder_ = null; + } + + return this; + } + /** + * + * + * 
+     * A batch of aggregation results. Always present.
+     *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + */ + public com.google.datastore.v1.AggregationResultBatch.Builder getBatchBuilder() { + + onChanged(); + return getBatchFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * A batch of aggregation results. Always present.
+     *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + */ + public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder() { + if (batchBuilder_ != null) { + return batchBuilder_.getMessageOrBuilder(); + } else { + return batch_ == null + ? com.google.datastore.v1.AggregationResultBatch.getDefaultInstance() + : batch_; + } + } + /** + * + * + * 
+     * A batch of aggregation results. Always present.
+     *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationResultBatch, + com.google.datastore.v1.AggregationResultBatch.Builder, + com.google.datastore.v1.AggregationResultBatchOrBuilder> + getBatchFieldBuilder() { + if (batchBuilder_ == null) { + batchBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationResultBatch, + com.google.datastore.v1.AggregationResultBatch.Builder, + com.google.datastore.v1.AggregationResultBatchOrBuilder>( + getBatch(), getParentForChildren(), isClean()); + batch_ = null; + } + return batchBuilder_; + } + + private com.google.datastore.v1.AggregationQuery query_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationQuery, + com.google.datastore.v1.AggregationQuery.Builder, + com.google.datastore.v1.AggregationQueryOrBuilder> + queryBuilder_; + /** + * + * + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.AggregationQuery 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.AggregationQuery query = 2; + * + * @return The query. + */ + public com.google.datastore.v1.AggregationQuery getQuery() { + if (queryBuilder_ == null) { + return query_ == null + ? com.google.datastore.v1.AggregationQuery.getDefaultInstance() + : query_; + } else { + return queryBuilder_.getMessage(); + } + } + /** + * + * + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.AggregationQuery query = 2; + */ + public Builder setQuery(com.google.datastore.v1.AggregationQuery value) { + if (queryBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + query_ = value; + onChanged(); + } else { + queryBuilder_.setMessage(value); + } + + return this; + } + /** + * + * + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.AggregationQuery query = 2; + */ + public Builder setQuery(com.google.datastore.v1.AggregationQuery.Builder builderForValue) { + if (queryBuilder_ == null) { + query_ = builderForValue.build(); + onChanged(); + } else { + queryBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * + * + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.AggregationQuery query = 2; + */ + public Builder mergeQuery(com.google.datastore.v1.AggregationQuery value) { + if (queryBuilder_ == null) { + if (query_ != null) { + query_ = + com.google.datastore.v1.AggregationQuery.newBuilder(query_) + .mergeFrom(value) + .buildPartial(); + } else { + query_ = value; + } + onChanged(); + } else { + queryBuilder_.mergeFrom(value); + } + + return this; + } + /** + * + * + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.AggregationQuery query = 2; + */ + public Builder clearQuery() { + if (queryBuilder_ == null) { + query_ = null; + onChanged(); + } else { + query_ = null; + queryBuilder_ = null; + } + + return this; + } + /** + * + * + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.AggregationQuery query = 2; + */ + public com.google.datastore.v1.AggregationQuery.Builder getQueryBuilder() { + + onChanged(); + return getQueryFieldBuilder().getBuilder(); + } + /** + * + * + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.AggregationQuery query = 2; + */ + public com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder() { + if (queryBuilder_ != null) { + return queryBuilder_.getMessageOrBuilder(); + } else { + return query_ == null + ? com.google.datastore.v1.AggregationQuery.getDefaultInstance() + : query_; + } + } + /** + * + * + * 
+     * The parsed form of the `GqlQuery` from the request, if it was set.
+     *
+ * + * .google.datastore.v1.AggregationQuery query = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationQuery, + com.google.datastore.v1.AggregationQuery.Builder, + com.google.datastore.v1.AggregationQueryOrBuilder> + getQueryFieldBuilder() { + if (queryBuilder_ == null) { + queryBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.datastore.v1.AggregationQuery, + com.google.datastore.v1.AggregationQuery.Builder, + com.google.datastore.v1.AggregationQueryOrBuilder>( + getQuery(), getParentForChildren(), isClean()); + query_ = null; + } + return queryBuilder_; + } + + @java.lang.Override + public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + // @@protoc_insertion_point(builder_scope:google.datastore.v1.RunAggregationQueryResponse) + } + + // @@protoc_insertion_point(class_scope:google.datastore.v1.RunAggregationQueryResponse) + private static final com.google.datastore.v1.RunAggregationQueryResponse DEFAULT_INSTANCE; + + static { + DEFAULT_INSTANCE = new com.google.datastore.v1.RunAggregationQueryResponse(); + } + + public static com.google.datastore.v1.RunAggregationQueryResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public RunAggregationQueryResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.datastore.v1.RunAggregationQueryResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } +} diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java new file mode 100644 index 000000000..d4fcaf245 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java @@ -0,0 +1,95 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/datastore/v1/datastore.proto + +package com.google.datastore.v1; + +public interface RunAggregationQueryResponseOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.datastore.v1.RunAggregationQueryResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + * 
+   * A batch of aggregation results. Always present.
+   *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + * + * @return Whether the batch field is set. + */ + boolean hasBatch(); + /** + * + * + * 
+   * A batch of aggregation results. Always present.
+   *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + * + * @return The batch. + */ + com.google.datastore.v1.AggregationResultBatch getBatch(); + /** + * + * + * 
+   * A batch of aggregation results. Always present.
+   *
+ * + * .google.datastore.v1.AggregationResultBatch batch = 1; + */ + com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder(); + + /** + * + * + * 
+   * The parsed form of the `GqlQuery` from the request, if it was set.
+   *
+ * + * .google.datastore.v1.AggregationQuery 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.AggregationQuery query = 2; + * + * @return The query. + */ + com.google.datastore.v1.AggregationQuery getQuery(); + /** + * + * + * 
+   * The parsed form of the `GqlQuery` from the request, if it was set.
+   *
+ * + * .google.datastore.v1.AggregationQuery query = 2; + */ + com.google.datastore.v1.AggregationQueryOrBuilder getQueryOrBuilder(); +} 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 51999dba5..5b30e3bac 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 @@ -53,121 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RunQueryRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 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; - } - 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; - } - 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; - } - case 74: - { - java.lang.String s = input.readStringRequireUtf8(); - - databaseId_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -571,7 +456,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -602,7 +487,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -638,7 +523,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -673,7 +558,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -802,17 +687,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.RunQueryRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -834,6 +712,12 @@ public Builder clear() { readOptions_ = null; readOptionsBuilder_ = null; } + if (queryBuilder_ != null) { + queryBuilder_.clear(); + } + if (gqlQueryBuilder_ != null) { + gqlQueryBuilder_.clear(); + } queryTypeCase_ = 0; queryType_ = null; return this; @@ -969,7 +853,7 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -984,17 +868,67 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.RunQueryRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getPartitionIdFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage(getQueryFieldBuilder().getBuilder(), extensionRegistry); + queryTypeCase_ = 3; + break; + } // case 26 + case 58: + { + input.readMessage(getGqlQueryFieldBuilder().getBuilder(), extensionRegistry); + queryTypeCase_ = 7; + break; + } // case 58 + case 66: + { + projectId_ = input.readStringRequireUtf8(); + + break; + } // case 66 + case 74: + { + databaseId_ = input.readStringRequireUtf8(); + + break; + } // case 74 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.RunQueryRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2076,7 +2010,18 @@ public RunQueryRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunQueryRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 cc025af6b..0eb1eb818 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 @@ -50,75 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private RunQueryResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 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; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -246,7 +177,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (query_ != null) { output.writeMessage(2, getQuery()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -261,7 +192,7 @@ public int getSerializedSize() { if (query_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -284,7 +215,7 @@ public boolean equals(final java.lang.Object obj) { if (hasQuery()) { if (!getQuery().equals(other.getQuery())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -303,7 +234,7 @@ public int hashCode() { hash = (37 * hash) + QUERY_FIELD_NUMBER; hash = (53 * hash) + getQuery().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -432,17 +363,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.RunQueryResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -552,7 +476,7 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) { if (other.hasQuery()) { mergeQuery(other.getQuery()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -567,17 +491,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.RunQueryResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getBatchFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getQueryFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.RunQueryResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -976,7 +926,18 @@ public RunQueryResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new RunQueryResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 27a3efa73..fc965df9d 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 @@ -53,81 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private TransactionOptions( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - 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 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 (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -195,50 +120,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ReadWrite( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - 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 (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -289,7 +170,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!previousTransaction_.isEmpty()) { output.writeBytes(1, previousTransaction_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -301,7 +182,7 @@ public int getSerializedSize() { if (!previousTransaction_.isEmpty()) { size += com.google.protobuf.CodedOutputStream.computeBytesSize(1, previousTransaction_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -318,7 +199,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.datastore.v1.TransactionOptions.ReadWrite) obj; if (!getPreviousTransaction().equals(other.getPreviousTransaction())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -331,7 +212,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + PREVIOUS_TRANSACTION_FIELD_NUMBER; hash = (53 * hash) + getPreviousTransaction().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -463,17 +344,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.TransactionOptions.ReadWrite.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -564,7 +438,7 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadWrite ot if (other.getPreviousTransaction() != com.google.protobuf.ByteString.EMPTY) { setPreviousTransaction(other.getPreviousTransaction()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -579,18 +453,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.TransactionOptions.ReadWrite parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + previousTransaction_ = input.readBytes(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.v1.TransactionOptions.ReadWrite) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -683,7 +576,19 @@ public ReadWrite parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadWrite(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -777,60 +682,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ReadOnly( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (readTime_ != null) { - subBuilder = readTime_.toBuilder(); - } - readTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(readTime_); - readTime_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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; @@ -912,7 +763,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (readTime_ != null) { output.writeMessage(1, getReadTime()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -924,7 +775,7 @@ public int getSerializedSize() { if (readTime_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadTime()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -944,7 +795,7 @@ public boolean equals(final java.lang.Object obj) { if (hasReadTime()) { if (!getReadTime().equals(other.getReadTime())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -959,7 +810,7 @@ public int hashCode() { hash = (37 * hash) + READ_TIME_FIELD_NUMBER; hash = (53 * hash) + getReadTime().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1091,17 +942,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1200,7 +1044,7 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadOnly oth if (other.hasReadTime()) { mergeReadTime(other.getReadTime()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1215,18 +1059,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.TransactionOptions.ReadOnly parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getReadTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.datastore.v1.TransactionOptions.ReadOnly) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1451,7 +1314,19 @@ public ReadOnly parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadOnly(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1639,7 +1514,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (modeCase_ == 2) { output.writeMessage(2, (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1658,7 +1533,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 2, (com.google.datastore.v1.TransactionOptions.ReadOnly) mode_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1685,7 +1560,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1708,7 +1583,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1840,22 +1715,21 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.TransactionOptions.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override public Builder clear() { super.clear(); + if (readWriteBuilder_ != null) { + readWriteBuilder_.clear(); + } + if (readOnlyBuilder_ != null) { + readOnlyBuilder_.clear(); + } modeCase_ = 0; mode_ = null; return this; @@ -1965,7 +1839,7 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1980,17 +1854,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.TransactionOptions parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getReadWriteFieldBuilder().getBuilder(), extensionRegistry); + modeCase_ = 1; + break; + } // case 10 + case 18: + { + input.readMessage(getReadOnlyFieldBuilder().getBuilder(), extensionRegistry); + modeCase_ = 2; + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.TransactionOptions) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2460,7 +2360,18 @@ public TransactionOptions parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new TransactionOptions(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; 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 9c1dc9ae8..e4168166a 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 @@ -51,167 +51,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Value( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - valueType_ = input.readBool(); - valueTypeCase_ = 1; - break; - } - case 16: - { - valueType_ = input.readInt64(); - valueTypeCase_ = 2; - break; - } - case 25: - { - valueType_ = input.readDouble(); - valueTypeCase_ = 3; - 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 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; - } - 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; - } - 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; - } - 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; - } - 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: - { - valueType_ = input.readBytes(); - valueTypeCase_ = 18; - 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 (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - 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_Value_descriptor; } @@ -943,7 +782,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (excludeFromIndexes_ != false) { output.writeBool(19, excludeFromIndexes_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1011,7 +850,7 @@ public int getSerializedSize() { if (excludeFromIndexes_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(19, excludeFromIndexes_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1067,7 +906,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1133,7 +972,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1261,22 +1100,30 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.datastore.v1.Value.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override public Builder clear() { super.clear(); + if (timestampValueBuilder_ != null) { + timestampValueBuilder_.clear(); + } + if (keyValueBuilder_ != null) { + keyValueBuilder_.clear(); + } + if (geoPointValueBuilder_ != null) { + geoPointValueBuilder_.clear(); + } + if (entityValueBuilder_ != null) { + entityValueBuilder_.clear(); + } + if (arrayValueBuilder_ != null) { + arrayValueBuilder_.clear(); + } meaning_ = 0; excludeFromIndexes_ = false; @@ -1483,7 +1330,7 @@ public Builder mergeFrom(com.google.datastore.v1.Value other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1498,17 +1345,111 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.datastore.v1.Value parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + valueType_ = input.readBool(); + valueTypeCase_ = 1; + break; + } // case 8 + case 16: + { + valueType_ = input.readInt64(); + valueTypeCase_ = 2; + break; + } // case 16 + case 25: + { + valueType_ = input.readDouble(); + valueTypeCase_ = 3; + break; + } // case 25 + case 42: + { + input.readMessage(getKeyValueFieldBuilder().getBuilder(), extensionRegistry); + valueTypeCase_ = 5; + break; + } // case 42 + case 50: + { + input.readMessage(getEntityValueFieldBuilder().getBuilder(), extensionRegistry); + valueTypeCase_ = 6; + break; + } // case 50 + case 66: + { + input.readMessage(getGeoPointValueFieldBuilder().getBuilder(), extensionRegistry); + valueTypeCase_ = 8; + break; + } // case 66 + case 74: + { + input.readMessage(getArrayValueFieldBuilder().getBuilder(), extensionRegistry); + valueTypeCase_ = 9; + break; + } // case 74 + case 82: + { + input.readMessage(getTimestampValueFieldBuilder().getBuilder(), extensionRegistry); + valueTypeCase_ = 10; + break; + } // case 82 + case 88: + { + int rawValue = input.readEnum(); + valueTypeCase_ = 11; + valueType_ = rawValue; + break; + } // case 88 + case 112: + { + meaning_ = input.readInt32(); + + break; + } // case 112 + case 138: + { + java.lang.String s = input.readStringRequireUtf8(); + valueTypeCase_ = 17; + valueType_ = s; + break; + } // case 138 + case 146: + { + valueType_ = input.readBytes(); + valueTypeCase_ = 18; + break; + } // case 146 + case 152: + { + excludeFromIndexes_ = input.readBool(); + + break; + } // case 152 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.datastore.v1.Value) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3312,7 +3253,18 @@ public Value parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Value(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto new file mode 100644 index 000000000..e9c1d4940 --- /dev/null +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto @@ -0,0 +1,61 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.datastore.v1; + +import "google/datastore/v1/entity.proto"; +import "google/datastore/v1/query.proto"; +import "google/protobuf/timestamp.proto"; + +option csharp_namespace = "Google.Cloud.Datastore.V1"; +option go_package = "google.golang.org/genproto/googleapis/datastore/v1;datastore"; +option java_multiple_files = true; +option java_outer_classname = "AggregationResultProto"; +option java_package = "com.google.datastore.v1"; +option php_namespace = "Google\\Cloud\\Datastore\\V1"; +option ruby_package = "Google::Cloud::Datastore::V1"; + +// The result of a single bucket from a Datastore aggregation query. +// +// The keys of `aggregate_properties` are the same for all results in an +// aggregation query, unlike entity queries which can have different fields +// present for each result. +message AggregationResult { + // The result of the aggregation functions, ex: `COUNT(*) AS total_entities`. + // + // The key is the [alias][google.datastore.v1.AggregationQuery.Aggregation.alias] + // assigned to the aggregation function on input and the size of this map + // equals the number of aggregation functions in the query. + map aggregate_properties = 2; +} + +// A batch of aggregation results produced by an aggregation query. +message AggregationResultBatch { + // The aggregation results for this batch. + repeated AggregationResult aggregation_results = 1; + + // The state of the query after the current batch. + // Only COUNT(*) aggregations are supported in the initial launch. Therefore, + // expected result type is limited to `NO_MORE_RESULTS`. + QueryResultBatch.MoreResultsType more_results = 2; + + // Read timestamp this batch was returned from. + // + // In a single transaction, subsequent query result batches for the same query + // can have a greater timestamp. Each batch's read timestamp + // is valid for all preceding batches. + google.protobuf.Timestamp read_time = 3; +} diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto index 4c8ac7626..e891e058f 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto @@ -19,6 +19,7 @@ package google.datastore.v1; import "google/api/annotations.proto"; import "google/api/client.proto"; import "google/api/field_behavior.proto"; +import "google/datastore/v1/aggregation_result.proto"; import "google/datastore/v1/entity.proto"; import "google/datastore/v1/query.proto"; import "google/protobuf/timestamp.proto"; @@ -61,6 +62,14 @@ service Datastore { }; } + // Runs an aggregation query. + rpc RunAggregationQuery(RunAggregationQueryRequest) returns (RunAggregationQueryResponse) { + option (google.api.http) = { + post: "/v1/projects/{project_id}:runAggregationQuery" + body: "*" + }; + } + // Begins a new transaction. rpc BeginTransaction(BeginTransactionRequest) returns (BeginTransactionResponse) { option (google.api.http) = { @@ -189,6 +198,45 @@ message RunQueryResponse { Query query = 2; } +// The request for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery]. +message RunAggregationQueryRequest { + // Required. The ID of the project against which to make the request. + string project_id = 8 [(google.api.field_behavior) = REQUIRED]; + + // The ID of the database against which to make the request. + // + // '(default)' is not allowed; please use empty string '' to refer the default + // database. + string database_id = 9; + + // Entities are partitioned into subsets, identified by a partition ID. + // Queries are scoped to a single partition. + // This partition ID is normalized with the standard default context + // partition ID. + PartitionId partition_id = 2; + + // The options for this query. + ReadOptions read_options = 1; + + // The type of query. + oneof query_type { + // The query to run. + AggregationQuery aggregation_query = 3; + + // The GQL query to run. This query must be an aggregation query. + GqlQuery gql_query = 7; + } +} + +// The response for [Datastore.RunAggregationQuery][google.datastore.v1.Datastore.RunAggregationQuery]. +message RunAggregationQueryResponse { + // A batch of aggregation results. Always present. + AggregationResultBatch batch = 1; + + // The parsed form of the `GqlQuery` from the request, if it was set. + AggregationQuery query = 2; +} + // The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. message BeginTransactionRequest { // Required. The ID of the project against which to make the request. diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto index cbe44932d..b16806ef2 100644 --- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto +++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto @@ -118,6 +118,93 @@ message Query { google.protobuf.Int32Value limit = 12; } +// Datastore query for running an aggregation over a [Query][google.datastore.v1.Query]. +message AggregationQuery { + // Defines a aggregation that produces a single result. + message Aggregation { + // Count of entities that match the query. + // + // The `COUNT(*)` aggregation function operates on the entire entity + // so it does not require a field reference. + message Count { + // Optional. Optional constraint on the maximum number of entities to count. + // + // This provides a way to set an upper bound on the number of entities + // to scan, limiting latency and cost. + // + // Unspecified is interpreted as no bound. + // + // If a zero value is provided, a count result of zero should always be + // expected. + // + // High-Level Example: + // + // ``` + // AGGREGATE COUNT_UP_TO(1000) OVER ( SELECT * FROM k ); + // ``` + // + // Requires: + // + // * Must be non-negative when present. + google.protobuf.Int64Value up_to = 1 [(google.api.field_behavior) = OPTIONAL]; + } + + // The type of aggregation to perform, required. + oneof operator { + // Count aggregator. + Count count = 1; + } + + // Optional. Optional name of the property to store the result of the aggregation. + // + // If not provided, Datastore will pick a default name following the format + // `property_`. For example: + // + // ``` + // AGGREGATE + // COUNT_UP_TO(1) AS count_up_to_1, + // COUNT_UP_TO(2), + // COUNT_UP_TO(3) AS count_up_to_3, + // COUNT_UP_TO(4) + // OVER ( + // ... + // ); + // ``` + // + // becomes: + // + // ``` + // AGGREGATE + // COUNT_UP_TO(1) AS count_up_to_1, + // COUNT_UP_TO(2) AS property_1, + // COUNT_UP_TO(3) AS count_up_to_3, + // COUNT_UP_TO(4) AS property_2 + // OVER ( + // ... + // ); + // ``` + // + // Requires: + // + // * Must be unique across all aggregation aliases. + // * Conform to [entity property name][google.datastore.v1.Entity.properties] limitations. + string alias = 7 [(google.api.field_behavior) = OPTIONAL]; + } + + // The base query to aggregate over. + oneof query_type { + // Nested query for aggregation + Query nested_query = 1; + } + + // Optional. Series of aggregations to apply over the results of the `nested_query`. + // + // Requires: + // + // * A minimum of one and maximum of five aggregations per query. + repeated Aggregation aggregations = 3 [(google.api.field_behavior) = OPTIONAL]; +} + // A representation of a kind. message KindExpression { // The name of the kind. diff --git a/renovate.json b/renovate.json index 2f6e8a062..f72fe4775 100644 --- a/renovate.json +++ b/renovate.json @@ -10,6 +10,7 @@ ":maintainLockFilesDisabled", ":autodetectPinVersions" ], + "ignorePaths": [".kokoro/requirements.txt"], "packageRules": [ { "packagePatterns": [ diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 139f1173d..0cfeca427 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-datastore - 2.11.3 + 2.11.4 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 22f5dddd1..05064b415 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-datastore - 2.11.3 + 2.11.4 diff --git a/versions.txt b/versions.txt index 8cc307de1..fac256bee 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-datastore:2.11.4:2.11.4 -google-cloud-datastore-bom:2.11.4:2.11.4 -proto-google-cloud-datastore-v1:0.102.4:0.102.4 -datastore-v1-proto-client:2.11.4:2.11.4 -proto-google-cloud-datastore-admin-v1:2.11.4:2.11.4 -grpc-google-cloud-datastore-admin-v1:2.11.4:2.11.4 +google-cloud-datastore:2.11.5:2.11.5 +google-cloud-datastore-bom:2.11.5:2.11.5 +proto-google-cloud-datastore-v1:0.102.5:0.102.5 +datastore-v1-proto-client:2.11.5:2.11.5 +proto-google-cloud-datastore-admin-v1:2.11.5:2.11.5 +grpc-google-cloud-datastore-admin-v1:2.11.5:2.11.5