diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 288e394897..f8a8575314 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c + digest: sha256:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1 diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in index a5010f77d4..b19a8dbfdd 100644 --- a/.kokoro/requirements.in +++ b/.kokoro/requirements.in @@ -1,34 +1,6 @@ -gcp-docuploader==0.6.3 -google-crc32c==1.3.0 -googleapis-common-protos==1.56.3 -gcp-releasetool==1.9.1 -cryptography==38.0.3 -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 -certifi==2022.12.7 -importlib-metadata==4.8.3 -zipp==3.6.0 -google_api_core==2.8.2 -google-cloud-storage==2.0.0 -google-resumable-media==2.3.3 -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.14.1 -idna==3.4 \ No newline at end of file +gcp-docuploader +gcp-releasetool +wheel +setuptools +typing-extensions +click<8.1.0 \ No newline at end of file diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 15c404aa5a..4895c9631f 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -1,27 +1,21 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # -# pip-compile --generate-hashes requirements.in +# pip-compile --allow-unsafe --generate-hashes requirements.in # attrs==22.1.0 \ --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \ --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool cachetools==4.2.4 \ --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \ --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1 - # via - # -r requirements.in - # google-auth + # via google-auth certifi==2022.12.7 \ --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \ --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18 - # via - # -r requirements.in - # requests + # via requests cffi==1.15.1 \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ @@ -87,9 +81,7 @@ cffi==1.15.1 \ --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \ --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \ --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0 - # via - # -r requirements.in - # cryptography + # via cryptography charset-normalizer==2.0.12 \ --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \ --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df @@ -98,6 +90,7 @@ click==8.0.4 \ --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb # via + # -r requirements.in # gcp-docuploader # gcp-releasetool colorlog==6.7.0 \ @@ -132,12 +125,11 @@ cryptography==38.0.3 \ --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \ --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722 # via - # -r requirements.in # gcp-releasetool # secretstorage -gcp-docuploader==0.6.3 \ - --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ - --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b +gcp-docuploader==0.6.4 \ + --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ + --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf # via -r requirements.in gcp-releasetool==1.9.1 \ --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \ @@ -147,13 +139,12 @@ 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.14.1 \ + --hash=sha256:ccaa901f31ad5cbb562615eb8b664b3dd0bf5404a67618e642307f00613eda4d \ --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016 # via - # -r requirements.in # gcp-releasetool # google-api-core # google-cloud-core @@ -161,15 +152,11 @@ google-auth==2.14.1 \ google-cloud-core==2.3.1 \ --hash=sha256:113ba4f492467d5bd442c8d724c1a25ad7384045c3178369038840ecdd19346c \ --hash=sha256:34334359cb04187bdc80ddcf613e462dfd7a3aabbc3fe4d118517ab4b9303d53 - # via - # -r requirements.in - # google-cloud-storage + # via google-cloud-storage google-cloud-storage==2.0.0 \ --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \ --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7 - # via - # -r requirements.in - # gcp-docuploader + # via gcp-docuploader google-crc32c==1.3.0 \ --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \ --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \ @@ -214,52 +201,37 @@ google-crc32c==1.3.0 \ --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \ --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \ --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3 - # via - # -r requirements.in - # google-resumable-media + # via google-resumable-media google-resumable-media==2.3.3 \ --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 - # via - # -r requirements.in - # google-cloud-storage + # via google-cloud-storage googleapis-common-protos==1.56.3 \ --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \ --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461 - # via - # -r requirements.in - # google-api-core + # via google-api-core idna==3.4 \ --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2 - # via - # -r requirements.in - # requests + # via requests importlib-metadata==4.8.3 \ --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \ --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668 + # via keyring +jeepney==0.8.0 \ + --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ + --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 # 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 + # via gcp-releasetool keyring==23.4.1 \ --hash=sha256:17e49fb0d6883c2b4445359434dba95aad84aabb29bbff044ad0ed7100232eca \ --hash=sha256:89cbd74d4683ed164c8082fb38619341097741323b3786905c6dac04d6915a55 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool markupsafe==2.0.1 \ --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \ --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \ @@ -330,49 +302,39 @@ markupsafe==2.0.1 \ --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \ --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \ --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872 - # via - # -r requirements.in - # jinja2 + # via jinja2 packaging==21.3 \ --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 + # via gcp-releasetool +protobuf==3.20.2 \ + --hash=sha256:03d76b7bd42ac4a6e109742a4edf81ffe26ffd87c5993126d894fe48a120396a \ + --hash=sha256:09e25909c4297d71d97612f04f41cea8fa8510096864f2835ad2f3b3df5a5559 \ + --hash=sha256:18e34a10ae10d458b027d7638a599c964b030c1739ebd035a1dfc0e22baa3bfe \ + --hash=sha256:291fb4307094bf5ccc29f424b42268640e00d5240bf0d9b86bf3079f7576474d \ + --hash=sha256:2c0b040d0b5d5d207936ca2d02f00f765906622c07d3fa19c23a16a8ca71873f \ + --hash=sha256:384164994727f274cc34b8abd41a9e7e0562801361ee77437099ff6dfedd024b \ + --hash=sha256:3cb608e5a0eb61b8e00fe641d9f0282cd0eedb603be372f91f163cbfbca0ded0 \ + --hash=sha256:5d9402bf27d11e37801d1743eada54372f986a372ec9679673bfcc5c60441151 \ + --hash=sha256:712dca319eee507a1e7df3591e639a2b112a2f4a62d40fe7832a16fd19151750 \ + --hash=sha256:7a5037af4e76c975b88c3becdf53922b5ffa3f2cddf657574a4920a3b33b80f3 \ + --hash=sha256:8228e56a865c27163d5d1d1771d94b98194aa6917bcfb6ce139cbfa8e3c27334 \ + --hash=sha256:84a1544252a933ef07bb0b5ef13afe7c36232a774affa673fc3636f7cee1db6c \ + --hash=sha256:84fe5953b18a383fd4495d375fe16e1e55e0a3afe7b4f7b4d01a3a0649fcda9d \ + --hash=sha256:9c673c8bfdf52f903081816b9e0e612186684f4eb4c17eeb729133022d6032e3 \ + --hash=sha256:a9e5ae5a8e8985c67e8944c23035a0dff2c26b0f5070b2f55b217a1c33bbe8b1 \ + --hash=sha256:b4fdb29c5a7406e3f7ef176b2a7079baa68b5b854f364c21abe327bbeec01cdb \ + --hash=sha256:c184485e0dfba4dfd451c3bd348c2e685d6523543a0f91b9fd4ae90eb09e8422 \ + --hash=sha256:c9cdf251c582c16fd6a9f5e95836c90828d51b0069ad22f463761d27c6c19019 \ + --hash=sha256:e39cf61bb8582bda88cdfebc0db163b774e7e03364bbf9ce1ead13863e81e359 \ + --hash=sha256:e8fbc522303e09036c752a0afcc5c0603e917222d8bedc02813fd73b4b4ed804 \ + --hash=sha256:f34464ab1207114e73bba0794d1257c150a2b89b7a9faf504e00af7c9fd58978 \ + --hash=sha256:f52dabc96ca99ebd2169dadbe018824ebda08a795c7684a0b7d203a290f3adb0 # 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 @@ -386,71 +348,61 @@ pyasn1-modules==0.2.8 \ pycparser==2.21 \ --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 - # via - # -r requirements.in - # cffi + # via cffi pyjwt==2.4.0 \ --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \ --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool pyparsing==3.0.9 \ --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc - # via - # -r requirements.in - # packaging + # via packaging pyperclip==1.8.2 \ --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool python-dateutil==2.8.2 \ --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 - # via - # -r requirements.in - # gcp-releasetool + # via 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 + # via google-auth secretstorage==3.3.3 \ --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 # via keyring +setuptools==65.6.3 \ + --hash=sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54 \ + --hash=sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75 + # via -r requirements.in 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 +typing-extensions==4.4.0 \ + --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \ + --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e # via -r requirements.in urllib3==1.26.12 \ --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \ --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 - # via - # -r requirements.in - # requests + # via requests +wheel==0.38.4 \ + --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \ + --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8 + # via -r requirements.in zipp==3.6.0 \ --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \ --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc - # via - # -r requirements.in - # importlib-metadata + # via importlib-metadata diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e2065e811..bf1d38c93c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.18.2](https://github.com/googleapis/java-bigtable/compare/v2.18.1...v2.18.2) (2023-01-24) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-monitoring-bom to v3.10.0 ([#1597](https://github.com/googleapis/java-bigtable/issues/1597)) ([1724d4e](https://github.com/googleapis/java-bigtable/commit/1724d4ee6b63085b035082bd299668ceadd8bd01)) +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.2 ([#1595](https://github.com/googleapis/java-bigtable/issues/1595)) ([e466191](https://github.com/googleapis/java-bigtable/commit/e466191ef8562b767218dcd4811a271ec6e98257)) + ## [2.18.1](https://github.com/googleapis/java-bigtable/compare/v2.18.0...v2.18.1) (2023-01-17) diff --git a/README.md b/README.md index 2c04484a0d..5821a8c9f4 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.3.0 + 26.4.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-bigtable - 2.18.0 + 2.18.1 ``` @@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.3.0') +implementation platform('com.google.cloud:libraries-bom:26.4.0') implementation 'com.google.cloud:google-cloud-bigtable' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-bigtable:2.18.0' +implementation 'com.google.cloud:google-cloud-bigtable:2.18.1' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.18.0" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.18.1" ``` ## Authentication diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index 9665a9c922..45197bb86a 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigtable-bom - 2.18.1 + 2.18.2 pom com.google.cloud @@ -63,42 +63,42 @@ com.google.cloud google-cloud-bigtable - 2.18.1 + 2.18.2 com.google.cloud google-cloud-bigtable-emulator - 0.155.1 + 0.155.2 com.google.cloud google-cloud-bigtable-emulator-core - 0.155.1 + 0.155.2 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.18.1 + 2.18.2 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.18.1 + 2.18.2 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.18.1 + 2.18.2 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.18.1 + 2.18.2 com.google.cloud google-cloud-bigtable-stats - 2.18.1 + 2.18.2 diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index f71b30a69e..255753bd62 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -13,7 +13,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.18.1 + 2.18.2 pom @@ -66,14 +66,14 @@ com.google.cloud google-cloud-shared-dependencies - 3.1.1 + 3.1.2 pom import com.google.cloud google-cloud-monitoring-bom - 3.9.0 + 3.10.0 diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml index 05366415ff..d740ca78f8 100644 --- a/google-cloud-bigtable-emulator-core/pom.xml +++ b/google-cloud-bigtable-emulator-core/pom.xml @@ -7,11 +7,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.18.1 + 2.18.2 google-cloud-bigtable-emulator-core - 0.155.1 + 0.155.2 A Java wrapper for the Cloud Bigtable emulator. diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index c90bbe9796..cf8752e3cf 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-bigtable-emulator - 0.155.1 + 0.155.2 Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.18.1 + 2.18.2 scm:git:git@github.com:googleapis/java-bigtable.git @@ -81,14 +81,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.18.1 + 2.18.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.18.1 + 2.18.2 pom import @@ -99,7 +99,7 @@ com.google.cloud google-cloud-bigtable-emulator-core - 0.155.1 + 0.155.2 diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml index b03ce2e58c..49e435f0e2 100644 --- a/google-cloud-bigtable-stats/pom.xml +++ b/google-cloud-bigtable-stats/pom.xml @@ -5,7 +5,7 @@ com.google.cloud google-cloud-bigtable-parent - 2.18.1 + 2.18.2 4.0.0 @@ -13,7 +13,7 @@ through Stackdriver. Built-in metrics will be implemented with shaded OpenCensus so it won't interfere with customer's application metrics. --> google-cloud-bigtable-stats - 2.18.1 + 2.18.2 Experimental project to shade OpenCensus dependencies. @@ -21,7 +21,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.18.1 + 2.18.2 pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index a3ab080619..2cbc4032ab 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 2.18.1 + 2.18.2 jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 2.18.1 + 2.18.2 - 2.18.1 + 2.18.2 google-cloud-bigtable @@ -43,14 +43,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.18.1 + 2.18.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.18.1 + 2.18.2 pom import diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java index 982f236238..d190980867 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java @@ -20,6 +20,6 @@ @InternalApi("For internal use only") public final class Version { // {x-version-update-start:google-cloud-bigtable:current} - public static String VERSION = "2.18.1"; + public static String VERSION = "2.18.2"; // {x-version-update-end} } diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/UnaryMetricsMetadataIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/UnaryMetricsMetadataIT.java index 0c8570b261..aa2a4317fc 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/UnaryMetricsMetadataIT.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/UnaryMetricsMetadataIT.java @@ -28,6 +28,7 @@ import com.google.cloud.bigtable.test_helpers.env.TestEnvRule; import java.util.List; import java.util.UUID; +import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.junit.BeforeClass; import org.junit.ClassRule; @@ -69,7 +70,13 @@ public void testSuccess() throws Exception { List clusters = clustersFuture.get(1, TimeUnit.MINUTES); // give opencensus some time to populate view data - Thread.sleep(100); + for (int i = 0; i < 10; i++) { + if (StatsWrapper.getOperationLatencyViewTagValueStrings() + .contains(clusters.get(0).getZone())) { + break; + } + Thread.sleep(100); + } List tagValueStrings = StatsWrapper.getOperationLatencyViewTagValueStrings(); assertThat(tagValueStrings).contains(clusters.get(0).getZone()); @@ -77,21 +84,35 @@ public void testSuccess() throws Exception { } @Test - public void testFailure() throws InterruptedException { + public void testFailure() throws Exception { String rowKey = UUID.randomUUID().toString(); String familyId = testEnvRule.env().getFamilyId(); + ApiFuture future = + testEnvRule + .env() + .getDataClient() + .mutateRowCallable() + .futureCall( + RowMutation.create("non-exist-table", rowKey).setCell(familyId, "q", "myVal")); + try { - testEnvRule - .env() - .getDataClient() - .mutateRowCallable() - .call(RowMutation.create("non-exist-table", rowKey).setCell(familyId, "q", "myVal")); - } catch (NotFoundException e) { + future.get(1, TimeUnit.MINUTES); + } catch (ExecutionException e) { + if (e.getCause() instanceof NotFoundException) { + // ignore NotFoundException + } else { + throw e; + } } // give opencensus some time to populate view data - Thread.sleep(100); + for (int i = 0; i < 10; i++) { + if (StatsWrapper.getOperationLatencyViewTagValueStrings().contains("unspecified")) { + break; + } + Thread.sleep(100); + } List tagValueStrings = StatsWrapper.getOperationLatencyViewTagValueStrings(); assertThat(tagValueStrings).contains("unspecified"); diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlCallableTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlCallableTest.java index 4db1f5a31f..0740c0deb6 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlCallableTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/DynamicFlowControlCallableTest.java @@ -20,7 +20,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.gax.batching.DynamicFlowControlSettings; -import com.google.api.gax.batching.FlowControlEventStats; import com.google.api.gax.batching.FlowController; import com.google.api.gax.batching.FlowController.LimitExceededBehavior; import com.google.api.gax.grpc.GrpcCallContext; @@ -40,6 +39,7 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -60,7 +60,6 @@ public class DynamicFlowControlCallableTest { private static final int DEADLINE_EXCEEDED_LATENCY = 501; private FlowController flowController; - private FlowControlEventStats flowControlEvents; private DynamicFlowControlStats stats; private UnaryCallable innerCallable; private ApiCallContext context; @@ -81,7 +80,6 @@ public void setup() { .setMinOutstandingRequestBytes(15L) .setLimitExceededBehavior(LimitExceededBehavior.Block) .build()); - flowControlEvents = flowController.getFlowControlEventStats(); stats = new DynamicFlowControlStats(); context = GrpcCallContext.createDefault(); innerCallable = new MockInnerCallable(); @@ -94,8 +92,18 @@ public void setup() { innerCallable, flowController, stats, TARGET_LATENCY_MS, ADJUSTING_INTERVAL_MS); } + @After + public void cleanup() { + // reset last adjustedTimestamp after each test + stats.setLastAdjustedTimestampMs(stats.getLastAdjustedTimestampMs(), 0); + } + @Test public void testLatenciesAreRecorded() throws Exception { + DynamicFlowControlStats stats = new DynamicFlowControlStats(); + DynamicFlowControlCallable callableToTest = + new DynamicFlowControlCallable( + innerCallable, flowController, stats, TARGET_LATENCY_MS, ADJUSTING_INTERVAL_MS); Map> extraHeaders = new HashMap<>(); extraHeaders.put(LATENCY_HEADER, Arrays.asList("5")); ApiCallContext newContext = context.withExtraHeaders(extraHeaders); diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index 0c4f87a3b7..86871c94d1 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.18.1 + 2.18.2 grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.18.1 + 2.18.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.18.1 + 2.18.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.18.1 + 2.18.2 pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index 2d8f00a306..5c367e1485 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.18.1 + 2.18.2 grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.18.1 + 2.18.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.18.1 + 2.18.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.18.1 + 2.18.2 pom import diff --git a/pom.xml b/pom.xml index 42295371f3..09be9cc61e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 2.18.1 + 2.18.2 Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable @@ -153,27 +153,27 @@ com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.18.1 + 2.18.2 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.18.1 + 2.18.2 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 2.18.1 + 2.18.2 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 2.18.1 + 2.18.2 com.google.cloud google-cloud-bigtable - 2.18.1 + 2.18.2 diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index 5e7056ec61..96b7c30725 100644 --- a/proto-google-cloud-bigtable-admin-v2/pom.xml +++ b/proto-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 2.18.1 + 2.18.2 proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 2.18.1 + 2.18.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.18.1 + 2.18.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.18.1 + 2.18.2 pom import diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java index b8dd885f7a..6305b83c52 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java @@ -184,6 +184,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int CLUSTER_IDS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList clusterIds_; /** * @@ -461,6 +463,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; clusterIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); return this; @@ -492,14 +495,26 @@ public com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny build() public com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny buildPartial() { com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny result = new com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny result) { if (((bitField0_ & 0x00000001) != 0)) { clusterIds_ = clusterIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } result.clusterIds_ = clusterIds_; - onBuilt(); - return result; + } + + private void buildPartial0( + com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -956,7 +971,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int CLUSTER_ID_FIELD_NUMBER = 1; - private volatile java.lang.Object clusterId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object clusterId_ = ""; /** * * @@ -1005,7 +1022,7 @@ public com.google.protobuf.ByteString getClusterIdBytes() { } public static final int ALLOW_TRANSACTIONAL_WRITES_FIELD_NUMBER = 2; - private boolean allowTransactionalWrites_; + private boolean allowTransactionalWrites_ = false; /** * * @@ -1235,10 +1252,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; clusterId_ = ""; - allowTransactionalWrites_ = false; - return this; } @@ -1267,12 +1283,24 @@ public com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting build() { public com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting buildPartial() { com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting result = new com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting(this); - result.clusterId_ = clusterId_; - result.allowTransactionalWrites_ = allowTransactionalWrites_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.clusterId_ = clusterId_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.allowTransactionalWrites_ = allowTransactionalWrites_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1324,6 +1352,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.AppProfile.SingleClusterRo return this; if (!other.getClusterId().isEmpty()) { clusterId_ = other.clusterId_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getAllowTransactionalWrites() != false) { @@ -1358,13 +1387,13 @@ public Builder mergeFrom( case 10: { clusterId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { allowTransactionalWrites_ = input.readBool(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -1384,6 +1413,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object clusterId_ = ""; /** * @@ -1445,8 +1476,8 @@ public Builder setClusterId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - clusterId_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1462,8 +1493,8 @@ public Builder setClusterId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearClusterId() { - clusterId_ = getDefaultInstance().getClusterId(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1484,8 +1515,8 @@ public Builder setClusterIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - clusterId_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1525,6 +1556,7 @@ public boolean getAllowTransactionalWrites() { public Builder setAllowTransactionalWrites(boolean value) { allowTransactionalWrites_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1542,7 +1574,7 @@ public Builder setAllowTransactionalWrites(boolean value) { * @return This builder for chaining. */ public Builder clearAllowTransactionalWrites() { - + bitField0_ = (bitField0_ & ~0x00000002); allowTransactionalWrites_ = false; onChanged(); return this; @@ -1663,7 +1695,9 @@ public RoutingPolicyCase getRoutingPolicyCase() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -1714,7 +1748,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int ETAG_FIELD_NUMBER = 2; - private volatile java.lang.Object etag_; + + @SuppressWarnings("serial") + private volatile java.lang.Object etag_ = ""; /** * * @@ -1777,7 +1813,9 @@ public com.google.protobuf.ByteString getEtagBytes() { } public static final int DESCRIPTION_FIELD_NUMBER = 3; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -2197,12 +2235,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - etag_ = ""; - description_ = ""; - if (multiClusterRoutingUseAnyBuilder_ != null) { multiClusterRoutingUseAnyBuilder_.clear(); } @@ -2238,28 +2274,38 @@ public com.google.bigtable.admin.v2.AppProfile build() { public com.google.bigtable.admin.v2.AppProfile buildPartial() { com.google.bigtable.admin.v2.AppProfile result = new com.google.bigtable.admin.v2.AppProfile(this); - result.name_ = name_; - result.etag_ = etag_; - result.description_ = description_; - if (routingPolicyCase_ == 5) { - if (multiClusterRoutingUseAnyBuilder_ == null) { - result.routingPolicy_ = routingPolicy_; - } else { - result.routingPolicy_ = multiClusterRoutingUseAnyBuilder_.build(); - } - } - if (routingPolicyCase_ == 6) { - if (singleClusterRoutingBuilder_ == null) { - result.routingPolicy_ = routingPolicy_; - } else { - result.routingPolicy_ = singleClusterRoutingBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - result.routingPolicyCase_ = routingPolicyCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.AppProfile result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.etag_ = etag_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.description_ = description_; + } + } + + private void buildPartialOneofs(com.google.bigtable.admin.v2.AppProfile result) { + result.routingPolicyCase_ = routingPolicyCase_; + result.routingPolicy_ = this.routingPolicy_; + if (routingPolicyCase_ == 5 && multiClusterRoutingUseAnyBuilder_ != null) { + result.routingPolicy_ = multiClusterRoutingUseAnyBuilder_.build(); + } + if (routingPolicyCase_ == 6 && singleClusterRoutingBuilder_ != null) { + result.routingPolicy_ = singleClusterRoutingBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -2307,14 +2353,17 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.AppProfile other) { if (other == com.google.bigtable.admin.v2.AppProfile.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getEtag().isEmpty()) { etag_ = other.etag_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000004; onChanged(); } switch (other.getRoutingPolicyCase()) { @@ -2362,19 +2411,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { etag_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 42: @@ -2422,6 +2471,8 @@ public Builder clearRoutingPolicy() { return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -2486,8 +2537,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2504,8 +2555,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -2527,8 +2578,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2615,8 +2666,8 @@ public Builder setEtag(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - etag_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2639,8 +2690,8 @@ public Builder setEtag(java.lang.String value) { * @return This builder for chaining. */ public Builder clearEtag() { - etag_ = getDefaultInstance().getEtag(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -2668,8 +2719,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - etag_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2735,8 +2786,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -2752,8 +2803,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -2774,8 +2825,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -3017,7 +3068,6 @@ public Builder clearMultiClusterRoutingUseAny() { } routingPolicyCase_ = 5; onChanged(); - ; return multiClusterRoutingUseAnyBuilder_; } @@ -3243,7 +3293,6 @@ public Builder clearSingleClusterRouting() { } routingPolicyCase_ = 6; onChanged(); - ; return singleClusterRoutingBuilder_; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingLimits.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingLimits.java index d6130f49e9..6478ab3e6f 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingLimits.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingLimits.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int MIN_SERVE_NODES_FIELD_NUMBER = 1; - private int minServeNodes_; + private int minServeNodes_ = 0; /** * * @@ -84,7 +84,7 @@ public int getMinServeNodes() { } public static final int MAX_SERVE_NODES_FIELD_NUMBER = 2; - private int maxServeNodes_; + private int maxServeNodes_ = 0; /** * * @@ -307,10 +307,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; minServeNodes_ = 0; - maxServeNodes_ = 0; - return this; } @@ -338,12 +337,23 @@ public com.google.bigtable.admin.v2.AutoscalingLimits build() { public com.google.bigtable.admin.v2.AutoscalingLimits buildPartial() { com.google.bigtable.admin.v2.AutoscalingLimits result = new com.google.bigtable.admin.v2.AutoscalingLimits(this); - result.minServeNodes_ = minServeNodes_; - result.maxServeNodes_ = maxServeNodes_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.AutoscalingLimits result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.minServeNodes_ = minServeNodes_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.maxServeNodes_ = maxServeNodes_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -424,13 +434,13 @@ public Builder mergeFrom( case 8: { minServeNodes_ = input.readInt32(); - + bitField0_ |= 0x00000001; break; } // case 8 case 16: { maxServeNodes_ = input.readInt32(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -450,6 +460,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int minServeNodes_; /** * @@ -481,6 +493,7 @@ public int getMinServeNodes() { public Builder setMinServeNodes(int value) { minServeNodes_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -496,7 +509,7 @@ public Builder setMinServeNodes(int value) { * @return This builder for chaining. */ public Builder clearMinServeNodes() { - + bitField0_ = (bitField0_ & ~0x00000001); minServeNodes_ = 0; onChanged(); return this; @@ -533,6 +546,7 @@ public int getMaxServeNodes() { public Builder setMaxServeNodes(int value) { maxServeNodes_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -548,7 +562,7 @@ public Builder setMaxServeNodes(int value) { * @return This builder for chaining. */ public Builder clearMaxServeNodes() { - + bitField0_ = (bitField0_ & ~0x00000002); maxServeNodes_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingTargets.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingTargets.java index d7c4351c78..99311776c2 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingTargets.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingTargets.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int CPU_UTILIZATION_PERCENT_FIELD_NUMBER = 2; - private int cpuUtilizationPercent_; + private int cpuUtilizationPercent_ = 0; /** * * @@ -87,7 +87,7 @@ public int getCpuUtilizationPercent() { } public static final int STORAGE_UTILIZATION_GIB_PER_NODE_FIELD_NUMBER = 3; - private int storageUtilizationGibPerNode_; + private int storageUtilizationGibPerNode_ = 0; /** * * @@ -316,10 +316,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; cpuUtilizationPercent_ = 0; - storageUtilizationGibPerNode_ = 0; - return this; } @@ -347,12 +346,23 @@ public com.google.bigtable.admin.v2.AutoscalingTargets build() { public com.google.bigtable.admin.v2.AutoscalingTargets buildPartial() { com.google.bigtable.admin.v2.AutoscalingTargets result = new com.google.bigtable.admin.v2.AutoscalingTargets(this); - result.cpuUtilizationPercent_ = cpuUtilizationPercent_; - result.storageUtilizationGibPerNode_ = storageUtilizationGibPerNode_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.AutoscalingTargets result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.cpuUtilizationPercent_ = cpuUtilizationPercent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.storageUtilizationGibPerNode_ = storageUtilizationGibPerNode_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -434,13 +444,13 @@ public Builder mergeFrom( case 16: { cpuUtilizationPercent_ = input.readInt32(); - + bitField0_ |= 0x00000001; break; } // case 16 case 24: { storageUtilizationGibPerNode_ = input.readInt32(); - + bitField0_ |= 0x00000002; break; } // case 24 default: @@ -460,6 +470,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int cpuUtilizationPercent_; /** * @@ -497,6 +509,7 @@ public int getCpuUtilizationPercent() { public Builder setCpuUtilizationPercent(int value) { cpuUtilizationPercent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -515,7 +528,7 @@ public Builder setCpuUtilizationPercent(int value) { * @return This builder for chaining. */ public Builder clearCpuUtilizationPercent() { - + bitField0_ = (bitField0_ & ~0x00000001); cpuUtilizationPercent_ = 0; onChanged(); return this; @@ -562,6 +575,7 @@ public int getStorageUtilizationGibPerNode() { public Builder setStorageUtilizationGibPerNode(int value) { storageUtilizationGibPerNode_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -582,7 +596,7 @@ public Builder setStorageUtilizationGibPerNode(int value) { * @return This builder for chaining. */ public Builder clearStorageUtilizationGibPerNode() { - + bitField0_ = (bitField0_ & ~0x00000002); storageUtilizationGibPerNode_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Backup.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Backup.java index 95df3f17d8..254a972076 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Backup.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Backup.java @@ -229,7 +229,9 @@ private State(int value) { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -294,7 +296,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int SOURCE_TABLE_FIELD_NUMBER = 2; - private volatile java.lang.Object sourceTable_; + + @SuppressWarnings("serial") + private volatile java.lang.Object sourceTable_ = ""; /** * * @@ -408,7 +412,7 @@ public com.google.protobuf.Timestamp getExpireTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() { - return getExpireTime(); + return expireTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expireTime_; } public static final int START_TIME_FIELD_NUMBER = 4; @@ -466,7 +470,7 @@ public com.google.protobuf.Timestamp getStartTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { - return getStartTime(); + return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_; } public static final int END_TIME_FIELD_NUMBER = 5; @@ -518,11 +522,11 @@ public com.google.protobuf.Timestamp getEndTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { - return getEndTime(); + return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } public static final int SIZE_BYTES_FIELD_NUMBER = 6; - private long sizeBytes_; + private long sizeBytes_ = 0L; /** * * @@ -540,7 +544,7 @@ public long getSizeBytes() { } public static final int STATE_FIELD_NUMBER = 7; - private int state_; + private int state_ = 0; /** * * @@ -573,9 +577,8 @@ public int getStateValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.Backup.State getState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Backup.State result = - com.google.bigtable.admin.v2.Backup.State.valueOf(state_); + com.google.bigtable.admin.v2.Backup.State.forNumber(state_); return result == null ? com.google.bigtable.admin.v2.Backup.State.UNRECOGNIZED : result; } @@ -630,7 +633,9 @@ public com.google.bigtable.admin.v2.EncryptionInfo getEncryptionInfo() { */ @java.lang.Override public com.google.bigtable.admin.v2.EncryptionInfoOrBuilder getEncryptionInfoOrBuilder() { - return getEncryptionInfo(); + return encryptionInfo_ == null + ? com.google.bigtable.admin.v2.EncryptionInfo.getDefaultInstance() + : encryptionInfo_; } private byte memoizedIsInitialized = -1; @@ -911,36 +916,29 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - sourceTable_ = ""; - - if (expireTimeBuilder_ == null) { - expireTime_ = null; - } else { - expireTime_ = null; + expireTime_ = null; + if (expireTimeBuilder_ != null) { + expireTimeBuilder_.dispose(); expireTimeBuilder_ = null; } - if (startTimeBuilder_ == null) { - startTime_ = null; - } else { - startTime_ = null; + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - if (endTimeBuilder_ == null) { - endTime_ = null; - } else { - endTime_ = null; + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } sizeBytes_ = 0L; - state_ = 0; - - if (encryptionInfoBuilder_ == null) { - encryptionInfo_ = null; - } else { - encryptionInfo_ = null; + encryptionInfo_ = null; + if (encryptionInfoBuilder_ != null) { + encryptionInfoBuilder_.dispose(); encryptionInfoBuilder_ = null; } return this; @@ -969,32 +967,40 @@ public com.google.bigtable.admin.v2.Backup build() { @java.lang.Override public com.google.bigtable.admin.v2.Backup buildPartial() { com.google.bigtable.admin.v2.Backup result = new com.google.bigtable.admin.v2.Backup(this); - result.name_ = name_; - result.sourceTable_ = sourceTable_; - if (expireTimeBuilder_ == null) { - result.expireTime_ = expireTime_; - } else { - result.expireTime_ = expireTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - if (startTimeBuilder_ == null) { - result.startTime_ = startTime_; - } else { - result.startTime_ = startTimeBuilder_.build(); + onBuilt(); + return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.Backup result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; } - if (endTimeBuilder_ == null) { - result.endTime_ = endTime_; - } else { - result.endTime_ = endTimeBuilder_.build(); + if (((from_bitField0_ & 0x00000002) != 0)) { + result.sourceTable_ = sourceTable_; } - result.sizeBytes_ = sizeBytes_; - result.state_ = state_; - if (encryptionInfoBuilder_ == null) { - result.encryptionInfo_ = encryptionInfo_; - } else { - result.encryptionInfo_ = encryptionInfoBuilder_.build(); + if (((from_bitField0_ & 0x00000004) != 0)) { + result.expireTime_ = expireTimeBuilder_ == null ? expireTime_ : expireTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.sizeBytes_ = sizeBytes_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.state_ = state_; + } + if (((from_bitField0_ & 0x00000080) != 0)) { + result.encryptionInfo_ = + encryptionInfoBuilder_ == null ? encryptionInfo_ : encryptionInfoBuilder_.build(); } - onBuilt(); - return result; } @java.lang.Override @@ -1044,10 +1050,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Backup other) { if (other == com.google.bigtable.admin.v2.Backup.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getSourceTable().isEmpty()) { sourceTable_ = other.sourceTable_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasExpireTime()) { @@ -1097,49 +1105,49 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { sourceTable_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getExpireTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 34 case 42: { input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 case 48: { sizeBytes_ = input.readInt64(); - + bitField0_ |= 0x00000020; break; } // case 48 case 56: { state_ = input.readEnum(); - + bitField0_ |= 0x00000040; break; } // case 56 case 74: { input.readMessage(getEncryptionInfoFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000080; break; } // case 74 default: @@ -1159,6 +1167,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -1244,8 +1254,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1269,8 +1279,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1299,8 +1309,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1378,8 +1388,8 @@ public Builder setSourceTable(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - sourceTable_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1399,8 +1409,8 @@ public Builder setSourceTable(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSourceTable() { - sourceTable_ = getDefaultInstance().getSourceTable(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1425,8 +1435,8 @@ public Builder setSourceTableBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - sourceTable_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1454,7 +1464,7 @@ public Builder setSourceTableBytes(com.google.protobuf.ByteString value) { * @return Whether the expireTime field is set. */ public boolean hasExpireTime() { - return expireTimeBuilder_ != null || expireTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1501,11 +1511,11 @@ public Builder setExpireTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } expireTime_ = value; - onChanged(); } else { expireTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1525,11 +1535,11 @@ public Builder setExpireTime(com.google.protobuf.Timestamp value) { public Builder setExpireTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (expireTimeBuilder_ == null) { expireTime_ = builderForValue.build(); - onChanged(); } else { expireTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1548,17 +1558,18 @@ public Builder setExpireTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeExpireTime(com.google.protobuf.Timestamp value) { if (expireTimeBuilder_ == null) { - if (expireTime_ != null) { - expireTime_ = - com.google.protobuf.Timestamp.newBuilder(expireTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && expireTime_ != null + && expireTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getExpireTimeBuilder().mergeFrom(value); } else { expireTime_ = value; } - onChanged(); } else { expireTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1576,14 +1587,13 @@ public Builder mergeExpireTime(com.google.protobuf.Timestamp value) { * */ public Builder clearExpireTime() { - if (expireTimeBuilder_ == null) { - expireTime_ = null; - onChanged(); - } else { - expireTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + expireTime_ = null; + if (expireTimeBuilder_ != null) { + expireTimeBuilder_.dispose(); expireTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1601,7 +1611,7 @@ public Builder clearExpireTime() { * */ public com.google.protobuf.Timestamp.Builder getExpireTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getExpireTimeFieldBuilder().getBuilder(); } @@ -1681,7 +1691,7 @@ public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() { * @return Whether the startTime field is set. */ public boolean hasStartTime() { - return startTimeBuilder_ != null || startTime_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1724,11 +1734,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } startTime_ = value; - onChanged(); } else { startTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1747,11 +1757,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (startTimeBuilder_ == null) { startTime_ = builderForValue.build(); - onChanged(); } else { startTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1769,17 +1779,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu */ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { if (startTimeBuilder_ == null) { - if (startTime_ != null) { - startTime_ = - com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && startTime_ != null + && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getStartTimeBuilder().mergeFrom(value); } else { startTime_ = value; } - onChanged(); } else { startTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1796,14 +1807,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { * */ public Builder clearStartTime() { - if (startTimeBuilder_ == null) { - startTime_ = null; - onChanged(); - } else { - startTime_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1820,7 +1830,7 @@ public Builder clearStartTime() { * */ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getStartTimeFieldBuilder().getBuilder(); } @@ -1894,7 +1904,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { * @return Whether the endTime field is set. */ public boolean hasEndTime() { - return endTimeBuilder_ != null || endTime_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -1933,11 +1943,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } endTime_ = value; - onChanged(); } else { endTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1954,11 +1964,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (endTimeBuilder_ == null) { endTime_ = builderForValue.build(); - onChanged(); } else { endTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1974,17 +1984,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) */ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { if (endTimeBuilder_ == null) { - if (endTime_ != null) { - endTime_ = - com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && endTime_ != null + && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getEndTimeBuilder().mergeFrom(value); } else { endTime_ = value; } - onChanged(); } else { endTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1999,14 +2010,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { * */ public Builder clearEndTime() { - if (endTimeBuilder_ == null) { - endTime_ = null; - onChanged(); - } else { - endTime_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -2021,7 +2031,7 @@ public Builder clearEndTime() { * */ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getEndTimeFieldBuilder().getBuilder(); } @@ -2102,6 +2112,7 @@ public long getSizeBytes() { public Builder setSizeBytes(long value) { sizeBytes_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2117,7 +2128,7 @@ public Builder setSizeBytes(long value) { * @return This builder for chaining. */ public Builder clearSizeBytes() { - + bitField0_ = (bitField0_ & ~0x00000020); sizeBytes_ = 0L; onChanged(); return this; @@ -2156,8 +2167,8 @@ public int getStateValue() { * @return This builder for chaining. */ public Builder setStateValue(int value) { - state_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -2176,9 +2187,8 @@ public Builder setStateValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.Backup.State getState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Backup.State result = - com.google.bigtable.admin.v2.Backup.State.valueOf(state_); + com.google.bigtable.admin.v2.Backup.State.forNumber(state_); return result == null ? com.google.bigtable.admin.v2.Backup.State.UNRECOGNIZED : result; } /** @@ -2199,7 +2209,7 @@ public Builder setState(com.google.bigtable.admin.v2.Backup.State value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000040; state_ = value.getNumber(); onChanged(); return this; @@ -2218,7 +2228,7 @@ public Builder setState(com.google.bigtable.admin.v2.Backup.State value) { * @return This builder for chaining. */ public Builder clearState() { - + bitField0_ = (bitField0_ & ~0x00000040); state_ = 0; onChanged(); return this; @@ -2244,7 +2254,7 @@ public Builder clearState() { * @return Whether the encryptionInfo field is set. */ public boolean hasEncryptionInfo() { - return encryptionInfoBuilder_ != null || encryptionInfo_ != null; + return ((bitField0_ & 0x00000080) != 0); } /** * @@ -2285,11 +2295,11 @@ public Builder setEncryptionInfo(com.google.bigtable.admin.v2.EncryptionInfo val throw new NullPointerException(); } encryptionInfo_ = value; - onChanged(); } else { encryptionInfoBuilder_.setMessage(value); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -2307,11 +2317,11 @@ public Builder setEncryptionInfo( com.google.bigtable.admin.v2.EncryptionInfo.Builder builderForValue) { if (encryptionInfoBuilder_ == null) { encryptionInfo_ = builderForValue.build(); - onChanged(); } else { encryptionInfoBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -2327,19 +2337,19 @@ public Builder setEncryptionInfo( */ public Builder mergeEncryptionInfo(com.google.bigtable.admin.v2.EncryptionInfo value) { if (encryptionInfoBuilder_ == null) { - if (encryptionInfo_ != null) { - encryptionInfo_ = - com.google.bigtable.admin.v2.EncryptionInfo.newBuilder(encryptionInfo_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000080) != 0) + && encryptionInfo_ != null + && encryptionInfo_ + != com.google.bigtable.admin.v2.EncryptionInfo.getDefaultInstance()) { + getEncryptionInfoBuilder().mergeFrom(value); } else { encryptionInfo_ = value; } - onChanged(); } else { encryptionInfoBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -2354,14 +2364,13 @@ public Builder mergeEncryptionInfo(com.google.bigtable.admin.v2.EncryptionInfo v * */ public Builder clearEncryptionInfo() { - if (encryptionInfoBuilder_ == null) { - encryptionInfo_ = null; - onChanged(); - } else { - encryptionInfo_ = null; + bitField0_ = (bitField0_ & ~0x00000080); + encryptionInfo_ = null; + if (encryptionInfoBuilder_ != null) { + encryptionInfoBuilder_.dispose(); encryptionInfoBuilder_ = null; } - + onChanged(); return this; } /** @@ -2376,7 +2385,7 @@ public Builder clearEncryptionInfo() { * */ public com.google.bigtable.admin.v2.EncryptionInfo.Builder getEncryptionInfoBuilder() { - + bitField0_ |= 0x00000080; onChanged(); return getEncryptionInfoFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BackupInfo.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BackupInfo.java index e06a057291..df95c68501 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BackupInfo.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BackupInfo.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int BACKUP_FIELD_NUMBER = 1; - private volatile java.lang.Object backup_; + + @SuppressWarnings("serial") + private volatile java.lang.Object backup_ = ""; /** * * @@ -166,7 +168,7 @@ public com.google.protobuf.Timestamp getStartTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { - return getStartTime(); + return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_; } public static final int END_TIME_FIELD_NUMBER = 3; @@ -218,11 +220,13 @@ public com.google.protobuf.Timestamp getEndTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { - return getEndTime(); + return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } public static final int SOURCE_TABLE_FIELD_NUMBER = 4; - private volatile java.lang.Object sourceTable_; + + @SuppressWarnings("serial") + private volatile java.lang.Object sourceTable_ = ""; /** * * @@ -503,22 +507,19 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; backup_ = ""; - - if (startTimeBuilder_ == null) { - startTime_ = null; - } else { - startTime_ = null; + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - if (endTimeBuilder_ == null) { - endTime_ = null; - } else { - endTime_ = null; + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } sourceTable_ = ""; - return this; } @@ -546,22 +547,29 @@ public com.google.bigtable.admin.v2.BackupInfo build() { public com.google.bigtable.admin.v2.BackupInfo buildPartial() { com.google.bigtable.admin.v2.BackupInfo result = new com.google.bigtable.admin.v2.BackupInfo(this); - result.backup_ = backup_; - if (startTimeBuilder_ == null) { - result.startTime_ = startTime_; - } else { - result.startTime_ = startTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - if (endTimeBuilder_ == null) { - result.endTime_ = endTime_; - } else { - result.endTime_ = endTimeBuilder_.build(); - } - result.sourceTable_ = sourceTable_; onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.BackupInfo result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.backup_ = backup_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.sourceTable_ = sourceTable_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -609,6 +617,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.BackupInfo other) { if (other == com.google.bigtable.admin.v2.BackupInfo.getDefaultInstance()) return this; if (!other.getBackup().isEmpty()) { backup_ = other.backup_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasStartTime()) { @@ -619,6 +628,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.BackupInfo other) { } if (!other.getSourceTable().isEmpty()) { sourceTable_ = other.sourceTable_; + bitField0_ |= 0x00000008; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -650,25 +660,25 @@ public Builder mergeFrom( case 10: { backup_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { sourceTable_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000008; break; } // case 34 default: @@ -688,6 +698,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object backup_ = ""; /** * @@ -749,8 +761,8 @@ public Builder setBackup(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - backup_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -766,8 +778,8 @@ public Builder setBackup(java.lang.String value) { * @return This builder for chaining. */ public Builder clearBackup() { - backup_ = getDefaultInstance().getBackup(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -788,8 +800,8 @@ public Builder setBackupBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - backup_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -814,7 +826,7 @@ public Builder setBackupBytes(com.google.protobuf.ByteString value) { * @return Whether the startTime field is set. */ public boolean hasStartTime() { - return startTimeBuilder_ != null || startTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -853,11 +865,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } startTime_ = value; - onChanged(); } else { startTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -874,11 +886,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (startTimeBuilder_ == null) { startTime_ = builderForValue.build(); - onChanged(); } else { startTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -894,17 +906,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu */ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { if (startTimeBuilder_ == null) { - if (startTime_ != null) { - startTime_ = - com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && startTime_ != null + && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getStartTimeBuilder().mergeFrom(value); } else { startTime_ = value; } - onChanged(); } else { startTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -919,14 +932,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { * */ public Builder clearStartTime() { - if (startTimeBuilder_ == null) { - startTime_ = null; - onChanged(); - } else { - startTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -941,7 +953,7 @@ public Builder clearStartTime() { * */ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getStartTimeFieldBuilder().getBuilder(); } @@ -1011,7 +1023,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { * @return Whether the endTime field is set. */ public boolean hasEndTime() { - return endTimeBuilder_ != null || endTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1050,11 +1062,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } endTime_ = value; - onChanged(); } else { endTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1071,11 +1083,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (endTimeBuilder_ == null) { endTime_ = builderForValue.build(); - onChanged(); } else { endTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1091,17 +1103,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) */ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { if (endTimeBuilder_ == null) { - if (endTime_ != null) { - endTime_ = - com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && endTime_ != null + && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getEndTimeBuilder().mergeFrom(value); } else { endTime_ = value; } - onChanged(); } else { endTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1116,14 +1129,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { * */ public Builder clearEndTime() { - if (endTimeBuilder_ == null) { - endTime_ = null; - onChanged(); - } else { - endTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1138,7 +1150,7 @@ public Builder clearEndTime() { * */ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getEndTimeFieldBuilder().getBuilder(); } @@ -1249,8 +1261,8 @@ public Builder setSourceTable(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - sourceTable_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1266,8 +1278,8 @@ public Builder setSourceTable(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSourceTable() { - sourceTable_ = getDefaultInstance().getSourceTable(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -1288,8 +1300,8 @@ public Builder setSourceTableBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - sourceTable_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java index 000ecfa098..2288444975 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -127,7 +129,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int CONSISTENCY_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object consistencyToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object consistencyToken_ = ""; /** * * @@ -382,10 +386,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - consistencyToken_ = ""; - return this; } @@ -413,12 +416,23 @@ public com.google.bigtable.admin.v2.CheckConsistencyRequest build() { public com.google.bigtable.admin.v2.CheckConsistencyRequest buildPartial() { com.google.bigtable.admin.v2.CheckConsistencyRequest result = new com.google.bigtable.admin.v2.CheckConsistencyRequest(this); - result.name_ = name_; - result.consistencyToken_ = consistencyToken_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.CheckConsistencyRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.consistencyToken_ = consistencyToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -467,10 +481,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CheckConsistencyRequest ot return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getConsistencyToken().isEmpty()) { consistencyToken_ = other.consistencyToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -502,13 +518,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { consistencyToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -528,6 +544,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -601,8 +619,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -622,8 +640,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -648,8 +666,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -715,8 +733,8 @@ public Builder setConsistencyToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - consistencyToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -732,8 +750,8 @@ public Builder setConsistencyToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearConsistencyToken() { - consistencyToken_ = getDefaultInstance().getConsistencyToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -754,8 +772,8 @@ public Builder setConsistencyTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - consistencyToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java index 1a074ebc66..94f31082dc 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java @@ -67,7 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int CONSISTENT_FIELD_NUMBER = 1; - private boolean consistent_; + private boolean consistent_ = false; /** * * @@ -284,8 +284,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; consistent_ = false; - return this; } @@ -313,11 +313,20 @@ public com.google.bigtable.admin.v2.CheckConsistencyResponse build() { public com.google.bigtable.admin.v2.CheckConsistencyResponse buildPartial() { com.google.bigtable.admin.v2.CheckConsistencyResponse result = new com.google.bigtable.admin.v2.CheckConsistencyResponse(this); - result.consistent_ = consistent_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.CheckConsistencyResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.consistent_ = consistent_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -396,7 +405,7 @@ public Builder mergeFrom( case 8: { consistent_ = input.readBool(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -416,6 +425,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private boolean consistent_; /** * @@ -449,6 +460,7 @@ public boolean getConsistent() { public Builder setConsistent(boolean value) { consistent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -465,7 +477,7 @@ public Builder setConsistent(boolean value) { * @return This builder for chaining. */ public Builder clearConsistent() { - + bitField0_ = (bitField0_ & ~0x00000001); consistent_ = false; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java index f4f95f51a8..9a2c27827b 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java @@ -472,7 +472,9 @@ public com.google.bigtable.admin.v2.AutoscalingLimits getAutoscalingLimits() { */ @java.lang.Override public com.google.bigtable.admin.v2.AutoscalingLimitsOrBuilder getAutoscalingLimitsOrBuilder() { - return getAutoscalingLimits(); + return autoscalingLimits_ == null + ? com.google.bigtable.admin.v2.AutoscalingLimits.getDefaultInstance() + : autoscalingLimits_; } public static final int AUTOSCALING_TARGETS_FIELD_NUMBER = 2; @@ -527,7 +529,9 @@ public com.google.bigtable.admin.v2.AutoscalingTargets getAutoscalingTargets() { @java.lang.Override public com.google.bigtable.admin.v2.AutoscalingTargetsOrBuilder getAutoscalingTargetsOrBuilder() { - return getAutoscalingTargets(); + return autoscalingTargets_ == null + ? com.google.bigtable.admin.v2.AutoscalingTargets.getDefaultInstance() + : autoscalingTargets_; } private byte memoizedIsInitialized = -1; @@ -750,16 +754,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (autoscalingLimitsBuilder_ == null) { - autoscalingLimits_ = null; - } else { - autoscalingLimits_ = null; + bitField0_ = 0; + autoscalingLimits_ = null; + if (autoscalingLimitsBuilder_ != null) { + autoscalingLimitsBuilder_.dispose(); autoscalingLimitsBuilder_ = null; } - if (autoscalingTargetsBuilder_ == null) { - autoscalingTargets_ = null; - } else { - autoscalingTargets_ = null; + autoscalingTargets_ = null; + if (autoscalingTargetsBuilder_ != null) { + autoscalingTargetsBuilder_.dispose(); autoscalingTargetsBuilder_ = null; } return this; @@ -790,20 +793,30 @@ public com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig build() { public com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig buildPartial() { com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig result = new com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig(this); - if (autoscalingLimitsBuilder_ == null) { - result.autoscalingLimits_ = autoscalingLimits_; - } else { - result.autoscalingLimits_ = autoscalingLimitsBuilder_.build(); - } - if (autoscalingTargetsBuilder_ == null) { - result.autoscalingTargets_ = autoscalingTargets_; - } else { - result.autoscalingTargets_ = autoscalingTargetsBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.autoscalingLimits_ = + autoscalingLimitsBuilder_ == null + ? autoscalingLimits_ + : autoscalingLimitsBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.autoscalingTargets_ = + autoscalingTargetsBuilder_ == null + ? autoscalingTargets_ + : autoscalingTargetsBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -890,14 +903,14 @@ public Builder mergeFrom( { input.readMessage( getAutoscalingLimitsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( getAutoscalingTargetsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -917,6 +930,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.AutoscalingLimits autoscalingLimits_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.AutoscalingLimits, @@ -937,7 +952,7 @@ public Builder mergeFrom( * @return Whether the autoscalingLimits field is set. */ public boolean hasAutoscalingLimits() { - return autoscalingLimitsBuilder_ != null || autoscalingLimits_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -978,11 +993,11 @@ public Builder setAutoscalingLimits(com.google.bigtable.admin.v2.AutoscalingLimi throw new NullPointerException(); } autoscalingLimits_ = value; - onChanged(); } else { autoscalingLimitsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1000,11 +1015,11 @@ public Builder setAutoscalingLimits( com.google.bigtable.admin.v2.AutoscalingLimits.Builder builderForValue) { if (autoscalingLimitsBuilder_ == null) { autoscalingLimits_ = builderForValue.build(); - onChanged(); } else { autoscalingLimitsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1020,19 +1035,19 @@ public Builder setAutoscalingLimits( */ public Builder mergeAutoscalingLimits(com.google.bigtable.admin.v2.AutoscalingLimits value) { if (autoscalingLimitsBuilder_ == null) { - if (autoscalingLimits_ != null) { - autoscalingLimits_ = - com.google.bigtable.admin.v2.AutoscalingLimits.newBuilder(autoscalingLimits_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && autoscalingLimits_ != null + && autoscalingLimits_ + != com.google.bigtable.admin.v2.AutoscalingLimits.getDefaultInstance()) { + getAutoscalingLimitsBuilder().mergeFrom(value); } else { autoscalingLimits_ = value; } - onChanged(); } else { autoscalingLimitsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1047,14 +1062,13 @@ public Builder mergeAutoscalingLimits(com.google.bigtable.admin.v2.AutoscalingLi * */ public Builder clearAutoscalingLimits() { - if (autoscalingLimitsBuilder_ == null) { - autoscalingLimits_ = null; - onChanged(); - } else { - autoscalingLimits_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + autoscalingLimits_ = null; + if (autoscalingLimitsBuilder_ != null) { + autoscalingLimitsBuilder_.dispose(); autoscalingLimitsBuilder_ = null; } - + onChanged(); return this; } /** @@ -1069,7 +1083,7 @@ public Builder clearAutoscalingLimits() { * */ public com.google.bigtable.admin.v2.AutoscalingLimits.Builder getAutoscalingLimitsBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getAutoscalingLimitsFieldBuilder().getBuilder(); } @@ -1142,7 +1156,7 @@ public com.google.bigtable.admin.v2.AutoscalingLimits.Builder getAutoscalingLimi * @return Whether the autoscalingTargets field is set. */ public boolean hasAutoscalingTargets() { - return autoscalingTargetsBuilder_ != null || autoscalingTargets_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -1183,11 +1197,11 @@ public Builder setAutoscalingTargets(com.google.bigtable.admin.v2.AutoscalingTar throw new NullPointerException(); } autoscalingTargets_ = value; - onChanged(); } else { autoscalingTargetsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1205,11 +1219,11 @@ public Builder setAutoscalingTargets( com.google.bigtable.admin.v2.AutoscalingTargets.Builder builderForValue) { if (autoscalingTargetsBuilder_ == null) { autoscalingTargets_ = builderForValue.build(); - onChanged(); } else { autoscalingTargetsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1226,19 +1240,19 @@ public Builder setAutoscalingTargets( public Builder mergeAutoscalingTargets( com.google.bigtable.admin.v2.AutoscalingTargets value) { if (autoscalingTargetsBuilder_ == null) { - if (autoscalingTargets_ != null) { - autoscalingTargets_ = - com.google.bigtable.admin.v2.AutoscalingTargets.newBuilder(autoscalingTargets_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && autoscalingTargets_ != null + && autoscalingTargets_ + != com.google.bigtable.admin.v2.AutoscalingTargets.getDefaultInstance()) { + getAutoscalingTargetsBuilder().mergeFrom(value); } else { autoscalingTargets_ = value; } - onChanged(); } else { autoscalingTargetsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1253,14 +1267,13 @@ public Builder mergeAutoscalingTargets( * */ public Builder clearAutoscalingTargets() { - if (autoscalingTargetsBuilder_ == null) { - autoscalingTargets_ = null; - onChanged(); - } else { - autoscalingTargets_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + autoscalingTargets_ = null; + if (autoscalingTargetsBuilder_ != null) { + autoscalingTargetsBuilder_.dispose(); autoscalingTargetsBuilder_ = null; } - + onChanged(); return this; } /** @@ -1276,7 +1289,7 @@ public Builder clearAutoscalingTargets() { */ public com.google.bigtable.admin.v2.AutoscalingTargets.Builder getAutoscalingTargetsBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getAutoscalingTargetsFieldBuilder().getBuilder(); } @@ -1543,7 +1556,9 @@ public boolean hasClusterAutoscalingConfig() { @java.lang.Override public com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfigOrBuilder getClusterAutoscalingConfigOrBuilder() { - return getClusterAutoscalingConfig(); + return clusterAutoscalingConfig_ == null + ? com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig.getDefaultInstance() + : clusterAutoscalingConfig_; } private byte memoizedIsInitialized = -1; @@ -1753,10 +1768,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (clusterAutoscalingConfigBuilder_ == null) { - clusterAutoscalingConfig_ = null; - } else { - clusterAutoscalingConfig_ = null; + bitField0_ = 0; + clusterAutoscalingConfig_ = null; + if (clusterAutoscalingConfigBuilder_ != null) { + clusterAutoscalingConfigBuilder_.dispose(); clusterAutoscalingConfigBuilder_ = null; } return this; @@ -1786,15 +1801,23 @@ public com.google.bigtable.admin.v2.Cluster.ClusterConfig build() { public com.google.bigtable.admin.v2.Cluster.ClusterConfig buildPartial() { com.google.bigtable.admin.v2.Cluster.ClusterConfig result = new com.google.bigtable.admin.v2.Cluster.ClusterConfig(this); - if (clusterAutoscalingConfigBuilder_ == null) { - result.clusterAutoscalingConfig_ = clusterAutoscalingConfig_; - } else { - result.clusterAutoscalingConfig_ = clusterAutoscalingConfigBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.Cluster.ClusterConfig result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.clusterAutoscalingConfig_ = + clusterAutoscalingConfigBuilder_ == null + ? clusterAutoscalingConfig_ + : clusterAutoscalingConfigBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1876,7 +1899,7 @@ public Builder mergeFrom( { input.readMessage( getClusterAutoscalingConfigFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -1896,6 +1919,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig clusterAutoscalingConfig_; private com.google.protobuf.SingleFieldBuilderV3< @@ -1917,7 +1942,7 @@ public Builder mergeFrom( * @return Whether the clusterAutoscalingConfig field is set. */ public boolean hasClusterAutoscalingConfig() { - return clusterAutoscalingConfigBuilder_ != null || clusterAutoscalingConfig_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -1960,11 +1985,11 @@ public Builder setClusterAutoscalingConfig( throw new NullPointerException(); } clusterAutoscalingConfig_ = value; - onChanged(); } else { clusterAutoscalingConfigBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1982,11 +2007,11 @@ public Builder setClusterAutoscalingConfig( com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig.Builder builderForValue) { if (clusterAutoscalingConfigBuilder_ == null) { clusterAutoscalingConfig_ = builderForValue.build(); - onChanged(); } else { clusterAutoscalingConfigBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -2003,20 +2028,20 @@ public Builder setClusterAutoscalingConfig( public Builder mergeClusterAutoscalingConfig( com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig value) { if (clusterAutoscalingConfigBuilder_ == null) { - if (clusterAutoscalingConfig_ != null) { - clusterAutoscalingConfig_ = - com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig.newBuilder( - clusterAutoscalingConfig_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && clusterAutoscalingConfig_ != null + && clusterAutoscalingConfig_ + != com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig + .getDefaultInstance()) { + getClusterAutoscalingConfigBuilder().mergeFrom(value); } else { clusterAutoscalingConfig_ = value; } - onChanged(); } else { clusterAutoscalingConfigBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -2031,14 +2056,13 @@ public Builder mergeClusterAutoscalingConfig( * */ public Builder clearClusterAutoscalingConfig() { - if (clusterAutoscalingConfigBuilder_ == null) { - clusterAutoscalingConfig_ = null; - onChanged(); - } else { - clusterAutoscalingConfig_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + clusterAutoscalingConfig_ = null; + if (clusterAutoscalingConfigBuilder_ != null) { + clusterAutoscalingConfigBuilder_.dispose(); clusterAutoscalingConfigBuilder_ = null; } - + onChanged(); return this; } /** @@ -2054,7 +2078,7 @@ public Builder clearClusterAutoscalingConfig() { */ public com.google.bigtable.admin.v2.Cluster.ClusterAutoscalingConfig.Builder getClusterAutoscalingConfigBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getClusterAutoscalingConfigFieldBuilder().getBuilder(); } @@ -2270,7 +2294,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int KMS_KEY_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object kmsKeyName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object kmsKeyName_ = ""; /** * * @@ -2537,8 +2563,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; kmsKeyName_ = ""; - return this; } @@ -2566,11 +2592,20 @@ public com.google.bigtable.admin.v2.Cluster.EncryptionConfig build() { public com.google.bigtable.admin.v2.Cluster.EncryptionConfig buildPartial() { com.google.bigtable.admin.v2.Cluster.EncryptionConfig result = new com.google.bigtable.admin.v2.Cluster.EncryptionConfig(this); - result.kmsKeyName_ = kmsKeyName_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.Cluster.EncryptionConfig result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.kmsKeyName_ = kmsKeyName_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -2621,6 +2656,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Cluster.EncryptionConfig o return this; if (!other.getKmsKeyName().isEmpty()) { kmsKeyName_ = other.kmsKeyName_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -2652,7 +2688,7 @@ public Builder mergeFrom( case 10: { kmsKeyName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -2672,6 +2708,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object kmsKeyName_ = ""; /** * @@ -2760,8 +2798,8 @@ public Builder setKmsKeyName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - kmsKeyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2786,8 +2824,8 @@ public Builder setKmsKeyName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearKmsKeyName() { - kmsKeyName_ = getDefaultInstance().getKmsKeyName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -2817,8 +2855,8 @@ public Builder setKmsKeyNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - kmsKeyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2932,7 +2970,9 @@ public ConfigCase getConfigCase() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -2983,7 +3023,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int LOCATION_FIELD_NUMBER = 2; - private volatile java.lang.Object location_; + + @SuppressWarnings("serial") + private volatile java.lang.Object location_ = ""; /** * * @@ -3042,7 +3084,7 @@ public com.google.protobuf.ByteString getLocationBytes() { } public static final int STATE_FIELD_NUMBER = 3; - private int state_; + private int state_ = 0; /** * * @@ -3075,14 +3117,13 @@ public int getStateValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.Cluster.State getState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Cluster.State result = - com.google.bigtable.admin.v2.Cluster.State.valueOf(state_); + com.google.bigtable.admin.v2.Cluster.State.forNumber(state_); return result == null ? com.google.bigtable.admin.v2.Cluster.State.UNRECOGNIZED : result; } public static final int SERVE_NODES_FIELD_NUMBER = 4; - private int serveNodes_; + private int serveNodes_ = 0; /** * * @@ -3152,7 +3193,7 @@ public com.google.bigtable.admin.v2.Cluster.ClusterConfigOrBuilder getClusterCon } public static final int DEFAULT_STORAGE_TYPE_FIELD_NUMBER = 5; - private int defaultStorageType_; + private int defaultStorageType_ = 0; /** * * @@ -3187,9 +3228,8 @@ public int getDefaultStorageTypeValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.StorageType getDefaultStorageType() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.StorageType result = - com.google.bigtable.admin.v2.StorageType.valueOf(defaultStorageType_); + com.google.bigtable.admin.v2.StorageType.forNumber(defaultStorageType_); return result == null ? com.google.bigtable.admin.v2.StorageType.UNRECOGNIZED : result; } @@ -3245,7 +3285,9 @@ public com.google.bigtable.admin.v2.Cluster.EncryptionConfig getEncryptionConfig @java.lang.Override public com.google.bigtable.admin.v2.Cluster.EncryptionConfigOrBuilder getEncryptionConfigOrBuilder() { - return getEncryptionConfig(); + return encryptionConfig_ == null + ? com.google.bigtable.admin.v2.Cluster.EncryptionConfig.getDefaultInstance() + : encryptionConfig_; } private byte memoizedIsInitialized = -1; @@ -3521,23 +3563,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - location_ = ""; - state_ = 0; - serveNodes_ = 0; - if (clusterConfigBuilder_ != null) { clusterConfigBuilder_.clear(); } defaultStorageType_ = 0; - - if (encryptionConfigBuilder_ == null) { - encryptionConfig_ = null; - } else { - encryptionConfig_ = null; + encryptionConfig_ = null; + if (encryptionConfigBuilder_ != null) { + encryptionConfigBuilder_.dispose(); encryptionConfigBuilder_ = null; } configCase_ = 0; @@ -3568,28 +3605,45 @@ public com.google.bigtable.admin.v2.Cluster build() { @java.lang.Override public com.google.bigtable.admin.v2.Cluster buildPartial() { com.google.bigtable.admin.v2.Cluster result = new com.google.bigtable.admin.v2.Cluster(this); - result.name_ = name_; - result.location_ = location_; - result.state_ = state_; - result.serveNodes_ = serveNodes_; - if (configCase_ == 7) { - if (clusterConfigBuilder_ == null) { - result.config_ = config_; - } else { - result.config_ = clusterConfigBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - result.defaultStorageType_ = defaultStorageType_; - if (encryptionConfigBuilder_ == null) { - result.encryptionConfig_ = encryptionConfig_; - } else { - result.encryptionConfig_ = encryptionConfigBuilder_.build(); - } - result.configCase_ = configCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.Cluster result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.location_ = location_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.state_ = state_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.serveNodes_ = serveNodes_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.defaultStorageType_ = defaultStorageType_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.encryptionConfig_ = + encryptionConfigBuilder_ == null ? encryptionConfig_ : encryptionConfigBuilder_.build(); + } + } + + private void buildPartialOneofs(com.google.bigtable.admin.v2.Cluster result) { + result.configCase_ = configCase_; + result.config_ = this.config_; + if (configCase_ == 7 && clusterConfigBuilder_ != null) { + result.config_ = clusterConfigBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -3637,10 +3691,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Cluster other) { if (other == com.google.bigtable.admin.v2.Cluster.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getLocation().isEmpty()) { location_ = other.location_; + bitField0_ |= 0x00000002; onChanged(); } if (other.state_ != 0) { @@ -3695,38 +3751,38 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { location_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { state_ = input.readEnum(); - + bitField0_ |= 0x00000004; break; } // case 24 case 32: { serveNodes_ = input.readInt32(); - + bitField0_ |= 0x00000008; break; } // case 32 case 40: { defaultStorageType_ = input.readEnum(); - + bitField0_ |= 0x00000020; break; } // case 40 case 50: { input.readMessage( getEncryptionConfigFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000040; break; } // case 50 case 58: @@ -3766,6 +3822,8 @@ public Builder clearConfig() { return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -3830,8 +3888,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3848,8 +3906,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -3871,8 +3929,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3953,8 +4011,8 @@ public Builder setLocation(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - location_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -3975,8 +4033,8 @@ public Builder setLocation(java.lang.String value) { * @return This builder for chaining. */ public Builder clearLocation() { - location_ = getDefaultInstance().getLocation(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -4002,8 +4060,8 @@ public Builder setLocationBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - location_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -4041,8 +4099,8 @@ public int getStateValue() { * @return This builder for chaining. */ public Builder setStateValue(int value) { - state_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -4061,9 +4119,8 @@ public Builder setStateValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.Cluster.State getState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Cluster.State result = - com.google.bigtable.admin.v2.Cluster.State.valueOf(state_); + com.google.bigtable.admin.v2.Cluster.State.forNumber(state_); return result == null ? com.google.bigtable.admin.v2.Cluster.State.UNRECOGNIZED : result; } /** @@ -4084,7 +4141,7 @@ public Builder setState(com.google.bigtable.admin.v2.Cluster.State value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000004; state_ = value.getNumber(); onChanged(); return this; @@ -4103,7 +4160,7 @@ public Builder setState(com.google.bigtable.admin.v2.Cluster.State value) { * @return This builder for chaining. */ public Builder clearState() { - + bitField0_ = (bitField0_ & ~0x00000004); state_ = 0; onChanged(); return this; @@ -4142,6 +4199,7 @@ public int getServeNodes() { public Builder setServeNodes(int value) { serveNodes_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -4158,7 +4216,7 @@ public Builder setServeNodes(int value) { * @return This builder for chaining. */ public Builder clearServeNodes() { - + bitField0_ = (bitField0_ & ~0x00000008); serveNodes_ = 0; onChanged(); return this; @@ -4370,7 +4428,6 @@ public com.google.bigtable.admin.v2.Cluster.ClusterConfigOrBuilder getClusterCon } configCase_ = 7; onChanged(); - ; return clusterConfigBuilder_; } @@ -4409,8 +4466,8 @@ public int getDefaultStorageTypeValue() { * @return This builder for chaining. */ public Builder setDefaultStorageTypeValue(int value) { - defaultStorageType_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -4430,9 +4487,8 @@ public Builder setDefaultStorageTypeValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.StorageType getDefaultStorageType() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.StorageType result = - com.google.bigtable.admin.v2.StorageType.valueOf(defaultStorageType_); + com.google.bigtable.admin.v2.StorageType.forNumber(defaultStorageType_); return result == null ? com.google.bigtable.admin.v2.StorageType.UNRECOGNIZED : result; } /** @@ -4454,7 +4510,7 @@ public Builder setDefaultStorageType(com.google.bigtable.admin.v2.StorageType va if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000020; defaultStorageType_ = value.getNumber(); onChanged(); return this; @@ -4474,7 +4530,7 @@ public Builder setDefaultStorageType(com.google.bigtable.admin.v2.StorageType va * @return This builder for chaining. */ public Builder clearDefaultStorageType() { - + bitField0_ = (bitField0_ & ~0x00000020); defaultStorageType_ = 0; onChanged(); return this; @@ -4500,7 +4556,7 @@ public Builder clearDefaultStorageType() { * @return Whether the encryptionConfig field is set. */ public boolean hasEncryptionConfig() { - return encryptionConfigBuilder_ != null || encryptionConfig_ != null; + return ((bitField0_ & 0x00000040) != 0); } /** * @@ -4542,11 +4598,11 @@ public Builder setEncryptionConfig( throw new NullPointerException(); } encryptionConfig_ = value; - onChanged(); } else { encryptionConfigBuilder_.setMessage(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -4564,11 +4620,11 @@ public Builder setEncryptionConfig( com.google.bigtable.admin.v2.Cluster.EncryptionConfig.Builder builderForValue) { if (encryptionConfigBuilder_ == null) { encryptionConfig_ = builderForValue.build(); - onChanged(); } else { encryptionConfigBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -4585,19 +4641,19 @@ public Builder setEncryptionConfig( public Builder mergeEncryptionConfig( com.google.bigtable.admin.v2.Cluster.EncryptionConfig value) { if (encryptionConfigBuilder_ == null) { - if (encryptionConfig_ != null) { - encryptionConfig_ = - com.google.bigtable.admin.v2.Cluster.EncryptionConfig.newBuilder(encryptionConfig_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000040) != 0) + && encryptionConfig_ != null + && encryptionConfig_ + != com.google.bigtable.admin.v2.Cluster.EncryptionConfig.getDefaultInstance()) { + getEncryptionConfigBuilder().mergeFrom(value); } else { encryptionConfig_ = value; } - onChanged(); } else { encryptionConfigBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -4612,14 +4668,13 @@ public Builder mergeEncryptionConfig( * */ public Builder clearEncryptionConfig() { - if (encryptionConfigBuilder_ == null) { - encryptionConfig_ = null; - onChanged(); - } else { - encryptionConfig_ = null; + bitField0_ = (bitField0_ & ~0x00000040); + encryptionConfig_ = null; + if (encryptionConfigBuilder_ != null) { + encryptionConfigBuilder_.dispose(); encryptionConfigBuilder_ = null; } - + onChanged(); return this; } /** @@ -4635,7 +4690,7 @@ public Builder clearEncryptionConfig() { */ public com.google.bigtable.admin.v2.Cluster.EncryptionConfig.Builder getEncryptionConfigBuilder() { - + bitField0_ |= 0x00000040; onChanged(); return getEncryptionConfigFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java index 5735bb824b..cbb44bcf2f 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java @@ -120,7 +120,7 @@ public com.google.bigtable.admin.v2.GcRule getGcRule() { */ @java.lang.Override public com.google.bigtable.admin.v2.GcRuleOrBuilder getGcRuleOrBuilder() { - return getGcRule(); + return gcRule_ == null ? com.google.bigtable.admin.v2.GcRule.getDefaultInstance() : gcRule_; } private byte memoizedIsInitialized = -1; @@ -325,10 +325,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (gcRuleBuilder_ == null) { - gcRule_ = null; - } else { - gcRule_ = null; + bitField0_ = 0; + gcRule_ = null; + if (gcRuleBuilder_ != null) { + gcRuleBuilder_.dispose(); gcRuleBuilder_ = null; } return this; @@ -358,15 +358,20 @@ public com.google.bigtable.admin.v2.ColumnFamily build() { public com.google.bigtable.admin.v2.ColumnFamily buildPartial() { com.google.bigtable.admin.v2.ColumnFamily result = new com.google.bigtable.admin.v2.ColumnFamily(this); - if (gcRuleBuilder_ == null) { - result.gcRule_ = gcRule_; - } else { - result.gcRule_ = gcRuleBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.ColumnFamily result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.gcRule_ = gcRuleBuilder_ == null ? gcRule_ : gcRuleBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -444,7 +449,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getGcRuleFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -464,6 +469,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.GcRule gcRule_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.GcRule, @@ -486,7 +493,7 @@ public Builder mergeFrom( * @return Whether the gcRule field is set. */ public boolean hasGcRule() { - return gcRuleBuilder_ != null || gcRule_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -529,11 +536,11 @@ public Builder setGcRule(com.google.bigtable.admin.v2.GcRule value) { throw new NullPointerException(); } gcRule_ = value; - onChanged(); } else { gcRuleBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -552,11 +559,11 @@ public Builder setGcRule(com.google.bigtable.admin.v2.GcRule value) { public Builder setGcRule(com.google.bigtable.admin.v2.GcRule.Builder builderForValue) { if (gcRuleBuilder_ == null) { gcRule_ = builderForValue.build(); - onChanged(); } else { gcRuleBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -574,19 +581,18 @@ public Builder setGcRule(com.google.bigtable.admin.v2.GcRule.Builder builderForV */ public Builder mergeGcRule(com.google.bigtable.admin.v2.GcRule value) { if (gcRuleBuilder_ == null) { - if (gcRule_ != null) { - gcRule_ = - com.google.bigtable.admin.v2.GcRule.newBuilder(gcRule_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && gcRule_ != null + && gcRule_ != com.google.bigtable.admin.v2.GcRule.getDefaultInstance()) { + getGcRuleBuilder().mergeFrom(value); } else { gcRule_ = value; } - onChanged(); } else { gcRuleBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -603,14 +609,13 @@ public Builder mergeGcRule(com.google.bigtable.admin.v2.GcRule value) { * .google.bigtable.admin.v2.GcRule gc_rule = 1; */ public Builder clearGcRule() { - if (gcRuleBuilder_ == null) { - gcRule_ = null; - onChanged(); - } else { - gcRule_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + gcRule_ = null; + if (gcRuleBuilder_ != null) { + gcRuleBuilder_.dispose(); gcRuleBuilder_ = null; } - + onChanged(); return this; } /** @@ -627,7 +632,7 @@ public Builder clearGcRule() { * .google.bigtable.admin.v2.GcRule gc_rule = 1; */ public com.google.bigtable.admin.v2.GcRule.Builder getGcRuleBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getGcRuleFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java index 631369711d..2c55523b9e 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int APP_PROFILE_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object appProfileId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object appProfileId_ = ""; /** * * @@ -232,11 +236,13 @@ public com.google.bigtable.admin.v2.AppProfile getAppProfile() { */ @java.lang.Override public com.google.bigtable.admin.v2.AppProfileOrBuilder getAppProfileOrBuilder() { - return getAppProfile(); + return appProfile_ == null + ? com.google.bigtable.admin.v2.AppProfile.getDefaultInstance() + : appProfile_; } public static final int IGNORE_WARNINGS_FIELD_NUMBER = 4; - private boolean ignoreWarnings_; + private boolean ignoreWarnings_ = false; /** * * @@ -482,18 +488,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - appProfileId_ = ""; - - if (appProfileBuilder_ == null) { - appProfile_ = null; - } else { - appProfile_ = null; + appProfile_ = null; + if (appProfileBuilder_ != null) { + appProfileBuilder_.dispose(); appProfileBuilder_ = null; } ignoreWarnings_ = false; - return this; } @@ -521,18 +524,29 @@ public com.google.bigtable.admin.v2.CreateAppProfileRequest build() { public com.google.bigtable.admin.v2.CreateAppProfileRequest buildPartial() { com.google.bigtable.admin.v2.CreateAppProfileRequest result = new com.google.bigtable.admin.v2.CreateAppProfileRequest(this); - result.parent_ = parent_; - result.appProfileId_ = appProfileId_; - if (appProfileBuilder_ == null) { - result.appProfile_ = appProfile_; - } else { - result.appProfile_ = appProfileBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.ignoreWarnings_ = ignoreWarnings_; onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.CreateAppProfileRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.appProfileId_ = appProfileId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.appProfile_ = appProfileBuilder_ == null ? appProfile_ : appProfileBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.ignoreWarnings_ = ignoreWarnings_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -581,10 +595,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateAppProfileRequest ot return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getAppProfileId().isEmpty()) { appProfileId_ = other.appProfileId_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasAppProfile()) { @@ -622,25 +638,25 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { appProfileId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getAppProfileFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 32: { ignoreWarnings_ = input.readBool(); - + bitField0_ |= 0x00000008; break; } // case 32 default: @@ -660,6 +676,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -733,8 +751,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -754,8 +772,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -780,8 +798,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -853,8 +871,8 @@ public Builder setAppProfileId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -872,8 +890,8 @@ public Builder setAppProfileId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAppProfileId() { - appProfileId_ = getDefaultInstance().getAppProfileId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -896,8 +914,8 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -923,7 +941,7 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { * @return Whether the appProfile field is set. */ public boolean hasAppProfile() { - return appProfileBuilder_ != null || appProfile_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -966,11 +984,11 @@ public Builder setAppProfile(com.google.bigtable.admin.v2.AppProfile value) { throw new NullPointerException(); } appProfile_ = value; - onChanged(); } else { appProfileBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -988,11 +1006,11 @@ public Builder setAppProfile(com.google.bigtable.admin.v2.AppProfile value) { public Builder setAppProfile(com.google.bigtable.admin.v2.AppProfile.Builder builderForValue) { if (appProfileBuilder_ == null) { appProfile_ = builderForValue.build(); - onChanged(); } else { appProfileBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1009,19 +1027,18 @@ public Builder setAppProfile(com.google.bigtable.admin.v2.AppProfile.Builder bui */ public Builder mergeAppProfile(com.google.bigtable.admin.v2.AppProfile value) { if (appProfileBuilder_ == null) { - if (appProfile_ != null) { - appProfile_ = - com.google.bigtable.admin.v2.AppProfile.newBuilder(appProfile_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && appProfile_ != null + && appProfile_ != com.google.bigtable.admin.v2.AppProfile.getDefaultInstance()) { + getAppProfileBuilder().mergeFrom(value); } else { appProfile_ = value; } - onChanged(); } else { appProfileBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1037,14 +1054,13 @@ public Builder mergeAppProfile(com.google.bigtable.admin.v2.AppProfile value) { * */ public Builder clearAppProfile() { - if (appProfileBuilder_ == null) { - appProfile_ = null; - onChanged(); - } else { - appProfile_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + appProfile_ = null; + if (appProfileBuilder_ != null) { + appProfileBuilder_.dispose(); appProfileBuilder_ = null; } - + onChanged(); return this; } /** @@ -1060,7 +1076,7 @@ public Builder clearAppProfile() { * */ public com.google.bigtable.admin.v2.AppProfile.Builder getAppProfileBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getAppProfileFieldBuilder().getBuilder(); } @@ -1145,6 +1161,7 @@ public boolean getIgnoreWarnings() { public Builder setIgnoreWarnings(boolean value) { ignoreWarnings_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1160,7 +1177,7 @@ public Builder setIgnoreWarnings(boolean value) { * @return This builder for chaining. */ public Builder clearIgnoreWarnings() { - + bitField0_ = (bitField0_ & ~0x00000008); ignoreWarnings_ = false; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupMetadata.java index 457f33ef61..c088fc7411 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupMetadata.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -119,7 +121,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int SOURCE_TABLE_FIELD_NUMBER = 2; - private volatile java.lang.Object sourceTable_; + + @SuppressWarnings("serial") + private volatile java.lang.Object sourceTable_ = ""; /** * * @@ -210,7 +214,7 @@ public com.google.protobuf.Timestamp getStartTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { - return getStartTime(); + return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_; } public static final int END_TIME_FIELD_NUMBER = 4; @@ -256,7 +260,7 @@ public com.google.protobuf.Timestamp getEndTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { - return getEndTime(); + return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } private byte memoizedIsInitialized = -1; @@ -494,20 +498,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - sourceTable_ = ""; - - if (startTimeBuilder_ == null) { - startTime_ = null; - } else { - startTime_ = null; + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - if (endTimeBuilder_ == null) { - endTime_ = null; - } else { - endTime_ = null; + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } return this; @@ -537,22 +538,29 @@ public com.google.bigtable.admin.v2.CreateBackupMetadata build() { public com.google.bigtable.admin.v2.CreateBackupMetadata buildPartial() { com.google.bigtable.admin.v2.CreateBackupMetadata result = new com.google.bigtable.admin.v2.CreateBackupMetadata(this); - result.name_ = name_; - result.sourceTable_ = sourceTable_; - if (startTimeBuilder_ == null) { - result.startTime_ = startTime_; - } else { - result.startTime_ = startTimeBuilder_.build(); - } - if (endTimeBuilder_ == null) { - result.endTime_ = endTime_; - } else { - result.endTime_ = endTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.CreateBackupMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.sourceTable_ = sourceTable_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -601,10 +609,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateBackupMetadata other return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getSourceTable().isEmpty()) { sourceTable_ = other.sourceTable_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasStartTime()) { @@ -642,25 +652,25 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { sourceTable_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 34 default: @@ -680,6 +690,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -741,8 +753,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -758,8 +770,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -780,8 +792,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -847,8 +859,8 @@ public Builder setSourceTable(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - sourceTable_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -864,8 +876,8 @@ public Builder setSourceTable(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSourceTable() { - sourceTable_ = getDefaultInstance().getSourceTable(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -886,8 +898,8 @@ public Builder setSourceTableBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - sourceTable_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -910,7 +922,7 @@ public Builder setSourceTableBytes(com.google.protobuf.ByteString value) { * @return Whether the startTime field is set. */ public boolean hasStartTime() { - return startTimeBuilder_ != null || startTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -945,11 +957,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } startTime_ = value; - onChanged(); } else { startTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -964,11 +976,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (startTimeBuilder_ == null) { startTime_ = builderForValue.build(); - onChanged(); } else { startTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -982,17 +994,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu */ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { if (startTimeBuilder_ == null) { - if (startTime_ != null) { - startTime_ = - com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && startTime_ != null + && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getStartTimeBuilder().mergeFrom(value); } else { startTime_ = value; } - onChanged(); } else { startTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1005,14 +1018,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp start_time = 3; */ public Builder clearStartTime() { - if (startTimeBuilder_ == null) { - startTime_ = null; - onChanged(); - } else { - startTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1025,7 +1037,7 @@ public Builder clearStartTime() { * .google.protobuf.Timestamp start_time = 3; */ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getStartTimeFieldBuilder().getBuilder(); } @@ -1089,7 +1101,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { * @return Whether the endTime field is set. */ public boolean hasEndTime() { - return endTimeBuilder_ != null || endTime_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1124,11 +1136,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } endTime_ = value; - onChanged(); } else { endTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1143,11 +1155,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (endTimeBuilder_ == null) { endTime_ = builderForValue.build(); - onChanged(); } else { endTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1161,17 +1173,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) */ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { if (endTimeBuilder_ == null) { - if (endTime_ != null) { - endTime_ = - com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && endTime_ != null + && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getEndTimeBuilder().mergeFrom(value); } else { endTime_ = value; } - onChanged(); } else { endTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1184,14 +1197,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp end_time = 4; */ public Builder clearEndTime() { - if (endTimeBuilder_ == null) { - endTime_ = null; - onChanged(); - } else { - endTime_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1204,7 +1216,7 @@ public Builder clearEndTime() { * .google.protobuf.Timestamp end_time = 4; */ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getEndTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupRequest.java index a897824bcd..84d0a8ba35 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int BACKUP_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object backupId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object backupId_ = ""; /** * * @@ -230,7 +234,7 @@ public com.google.bigtable.admin.v2.Backup getBackup() { */ @java.lang.Override public com.google.bigtable.admin.v2.BackupOrBuilder getBackupOrBuilder() { - return getBackup(); + return backup_ == null ? com.google.bigtable.admin.v2.Backup.getDefaultInstance() : backup_; } private byte memoizedIsInitialized = -1; @@ -453,14 +457,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - backupId_ = ""; - - if (backupBuilder_ == null) { - backup_ = null; - } else { - backup_ = null; + backup_ = null; + if (backupBuilder_ != null) { + backupBuilder_.dispose(); backupBuilder_ = null; } return this; @@ -490,17 +492,26 @@ public com.google.bigtable.admin.v2.CreateBackupRequest build() { public com.google.bigtable.admin.v2.CreateBackupRequest buildPartial() { com.google.bigtable.admin.v2.CreateBackupRequest result = new com.google.bigtable.admin.v2.CreateBackupRequest(this); - result.parent_ = parent_; - result.backupId_ = backupId_; - if (backupBuilder_ == null) { - result.backup_ = backup_; - } else { - result.backup_ = backupBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.CreateBackupRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.backupId_ = backupId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.backup_ = backupBuilder_ == null ? backup_ : backupBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -549,10 +560,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateBackupRequest other) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getBackupId().isEmpty()) { backupId_ = other.backupId_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasBackup()) { @@ -587,19 +600,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { backupId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getBackupFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -619,6 +632,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -692,8 +707,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -713,8 +728,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -739,8 +754,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -821,8 +836,8 @@ public Builder setBackupId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - backupId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -843,8 +858,8 @@ public Builder setBackupId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearBackupId() { - backupId_ = getDefaultInstance().getBackupId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -870,8 +885,8 @@ public Builder setBackupIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - backupId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -895,7 +910,7 @@ public Builder setBackupIdBytes(com.google.protobuf.ByteString value) { * @return Whether the backup field is set. */ public boolean hasBackup() { - return backupBuilder_ != null || backup_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -932,11 +947,11 @@ public Builder setBackup(com.google.bigtable.admin.v2.Backup value) { throw new NullPointerException(); } backup_ = value; - onChanged(); } else { backupBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -952,11 +967,11 @@ public Builder setBackup(com.google.bigtable.admin.v2.Backup value) { public Builder setBackup(com.google.bigtable.admin.v2.Backup.Builder builderForValue) { if (backupBuilder_ == null) { backup_ = builderForValue.build(); - onChanged(); } else { backupBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -971,19 +986,18 @@ public Builder setBackup(com.google.bigtable.admin.v2.Backup.Builder builderForV */ public Builder mergeBackup(com.google.bigtable.admin.v2.Backup value) { if (backupBuilder_ == null) { - if (backup_ != null) { - backup_ = - com.google.bigtable.admin.v2.Backup.newBuilder(backup_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && backup_ != null + && backup_ != com.google.bigtable.admin.v2.Backup.getDefaultInstance()) { + getBackupBuilder().mergeFrom(value); } else { backup_ = value; } - onChanged(); } else { backupBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -997,14 +1011,13 @@ public Builder mergeBackup(com.google.bigtable.admin.v2.Backup value) { * */ public Builder clearBackup() { - if (backupBuilder_ == null) { - backup_ = null; - onChanged(); - } else { - backup_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + backup_ = null; + if (backupBuilder_ != null) { + backupBuilder_.dispose(); backupBuilder_ = null; } - + onChanged(); return this; } /** @@ -1018,7 +1031,7 @@ public Builder clearBackup() { * */ public com.google.bigtable.admin.v2.Backup.Builder getBackupBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getBackupFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java index 13c30f5d4a..bb97c85cd3 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java @@ -355,7 +355,7 @@ private State(int value) { } public static final int ESTIMATED_SIZE_BYTES_FIELD_NUMBER = 2; - private long estimatedSizeBytes_; + private long estimatedSizeBytes_ = 0L; /** * * @@ -373,7 +373,7 @@ public long getEstimatedSizeBytes() { } public static final int ESTIMATED_COPIED_BYTES_FIELD_NUMBER = 3; - private long estimatedCopiedBytes_; + private long estimatedCopiedBytes_ = 0L; /** * * @@ -393,7 +393,7 @@ public long getEstimatedCopiedBytes() { } public static final int STATE_FIELD_NUMBER = 4; - private int state_; + private int state_ = 0; /** * .google.bigtable.admin.v2.CreateClusterMetadata.TableProgress.State state = 4; * @@ -410,9 +410,8 @@ public int getStateValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress.State getState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress.State result = - com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress.State.valueOf(state_); + com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress.State.forNumber(state_); return result == null ? com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress.State.UNRECOGNIZED : result; @@ -644,12 +643,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; estimatedSizeBytes_ = 0L; - estimatedCopiedBytes_ = 0L; - state_ = 0; - return this; } @@ -679,13 +676,27 @@ public com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress build() public com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress buildPartial() { com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress result = new com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress(this); - result.estimatedSizeBytes_ = estimatedSizeBytes_; - result.estimatedCopiedBytes_ = estimatedCopiedBytes_; - result.state_ = state_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.estimatedSizeBytes_ = estimatedSizeBytes_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.estimatedCopiedBytes_ = estimatedCopiedBytes_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.state_ = state_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -775,19 +786,19 @@ public Builder mergeFrom( case 16: { estimatedSizeBytes_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 16 case 24: { estimatedCopiedBytes_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 24 case 32: { state_ = input.readEnum(); - + bitField0_ |= 0x00000004; break; } // case 32 default: @@ -807,6 +818,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private long estimatedSizeBytes_; /** * @@ -838,6 +851,7 @@ public long getEstimatedSizeBytes() { public Builder setEstimatedSizeBytes(long value) { estimatedSizeBytes_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -853,7 +867,7 @@ public Builder setEstimatedSizeBytes(long value) { * @return This builder for chaining. */ public Builder clearEstimatedSizeBytes() { - + bitField0_ = (bitField0_ & ~0x00000001); estimatedSizeBytes_ = 0L; onChanged(); return this; @@ -894,6 +908,7 @@ public long getEstimatedCopiedBytes() { public Builder setEstimatedCopiedBytes(long value) { estimatedCopiedBytes_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -911,7 +926,7 @@ public Builder setEstimatedCopiedBytes(long value) { * @return This builder for chaining. */ public Builder clearEstimatedCopiedBytes() { - + bitField0_ = (bitField0_ & ~0x00000002); estimatedCopiedBytes_ = 0L; onChanged(); return this; @@ -934,8 +949,8 @@ public int getStateValue() { * @return This builder for chaining. */ public Builder setStateValue(int value) { - state_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -946,9 +961,9 @@ public Builder setStateValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress.State getState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress.State result = - com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress.State.valueOf(state_); + com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress.State.forNumber( + state_); return result == null ? com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress.State.UNRECOGNIZED : result; @@ -964,7 +979,7 @@ public Builder setState( if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000004; state_ = value.getNumber(); onChanged(); return this; @@ -975,7 +990,7 @@ public Builder setState( * @return This builder for chaining. */ public Builder clearState() { - + bitField0_ = (bitField0_ & ~0x00000004); state_ = 0; onChanged(); return this; @@ -1093,7 +1108,9 @@ public com.google.bigtable.admin.v2.CreateClusterRequest getOriginalRequest() { */ @java.lang.Override public com.google.bigtable.admin.v2.CreateClusterRequestOrBuilder getOriginalRequestOrBuilder() { - return getOriginalRequest(); + return originalRequest_ == null + ? com.google.bigtable.admin.v2.CreateClusterRequest.getDefaultInstance() + : originalRequest_; } public static final int REQUEST_TIME_FIELD_NUMBER = 2; @@ -1139,7 +1156,7 @@ public com.google.protobuf.Timestamp getRequestTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { - return getRequestTime(); + return requestTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : requestTime_; } public static final int FINISH_TIME_FIELD_NUMBER = 3; @@ -1185,7 +1202,7 @@ public com.google.protobuf.Timestamp getFinishTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() { - return getFinishTime(); + return finishTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : finishTime_; } public static final int TABLES_FIELD_NUMBER = 4; @@ -1207,6 +1224,7 @@ private static final class TablesDefaultEntryHolder { .getDefaultInstance()); } + @SuppressWarnings("serial") private com.google.protobuf.MapField< java.lang.String, com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress> tables_; @@ -1296,9 +1314,11 @@ public boolean containsTables(java.lang.String key) { * */ @java.lang.Override - public com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress getTablesOrDefault( - java.lang.String key, - com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress defaultValue) { + public /* nullable */ com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress + getTablesOrDefault( + java.lang.String key, + /* nullable */ + com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -1609,22 +1629,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - } else { - originalRequest_ = null; + bitField0_ = 0; + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - if (requestTimeBuilder_ == null) { - requestTime_ = null; - } else { - requestTime_ = null; + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - if (finishTimeBuilder_ == null) { - finishTime_ = null; - } else { - finishTime_ = null; + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } internalGetMutableTables().clear(); @@ -1655,26 +1673,30 @@ public com.google.bigtable.admin.v2.CreateClusterMetadata build() { public com.google.bigtable.admin.v2.CreateClusterMetadata buildPartial() { com.google.bigtable.admin.v2.CreateClusterMetadata result = new com.google.bigtable.admin.v2.CreateClusterMetadata(this); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.CreateClusterMetadata result) { int from_bitField0_ = bitField0_; - if (originalRequestBuilder_ == null) { - result.originalRequest_ = originalRequest_; - } else { - result.originalRequest_ = originalRequestBuilder_.build(); + if (((from_bitField0_ & 0x00000001) != 0)) { + result.originalRequest_ = + originalRequestBuilder_ == null ? originalRequest_ : originalRequestBuilder_.build(); } - if (requestTimeBuilder_ == null) { - result.requestTime_ = requestTime_; - } else { - result.requestTime_ = requestTimeBuilder_.build(); + if (((from_bitField0_ & 0x00000002) != 0)) { + result.requestTime_ = + requestTimeBuilder_ == null ? requestTime_ : requestTimeBuilder_.build(); } - if (finishTimeBuilder_ == null) { - result.finishTime_ = finishTime_; - } else { - result.finishTime_ = finishTimeBuilder_.build(); + if (((from_bitField0_ & 0x00000004) != 0)) { + result.finishTime_ = finishTimeBuilder_ == null ? finishTime_ : finishTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.tables_ = internalGetTables(); + result.tables_.makeImmutable(); } - result.tables_ = internalGetTables(); - result.tables_.makeImmutable(); - onBuilt(); - return result; } @java.lang.Override @@ -1733,6 +1755,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateClusterMetadata othe mergeFinishTime(other.getFinishTime()); } internalGetMutableTables().mergeFrom(other.internalGetTables()); + bitField0_ |= 0x00000008; this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -1762,19 +1785,19 @@ public Builder mergeFrom( case 10: { input.readMessage(getOriginalRequestFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getRequestTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getFinishTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: @@ -1789,6 +1812,7 @@ public Builder mergeFrom( internalGetMutableTables() .getMutableMap() .put(tables__.getKey(), tables__.getValue()); + bitField0_ |= 0x00000008; break; } // case 34 default: @@ -1828,7 +1852,7 @@ public Builder mergeFrom( * @return Whether the originalRequest field is set. */ public boolean hasOriginalRequest() { - return originalRequestBuilder_ != null || originalRequest_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -1865,11 +1889,11 @@ public Builder setOriginalRequest(com.google.bigtable.admin.v2.CreateClusterRequ throw new NullPointerException(); } originalRequest_ = value; - onChanged(); } else { originalRequestBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1885,11 +1909,11 @@ public Builder setOriginalRequest( com.google.bigtable.admin.v2.CreateClusterRequest.Builder builderForValue) { if (originalRequestBuilder_ == null) { originalRequest_ = builderForValue.build(); - onChanged(); } else { originalRequestBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1903,19 +1927,19 @@ public Builder setOriginalRequest( */ public Builder mergeOriginalRequest(com.google.bigtable.admin.v2.CreateClusterRequest value) { if (originalRequestBuilder_ == null) { - if (originalRequest_ != null) { - originalRequest_ = - com.google.bigtable.admin.v2.CreateClusterRequest.newBuilder(originalRequest_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && originalRequest_ != null + && originalRequest_ + != com.google.bigtable.admin.v2.CreateClusterRequest.getDefaultInstance()) { + getOriginalRequestBuilder().mergeFrom(value); } else { originalRequest_ = value; } - onChanged(); } else { originalRequestBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1928,14 +1952,13 @@ public Builder mergeOriginalRequest(com.google.bigtable.admin.v2.CreateClusterRe * .google.bigtable.admin.v2.CreateClusterRequest original_request = 1; */ public Builder clearOriginalRequest() { - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - onChanged(); - } else { - originalRequest_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - + onChanged(); return this; } /** @@ -1948,7 +1971,7 @@ public Builder clearOriginalRequest() { * .google.bigtable.admin.v2.CreateClusterRequest original_request = 1; */ public com.google.bigtable.admin.v2.CreateClusterRequest.Builder getOriginalRequestBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getOriginalRequestFieldBuilder().getBuilder(); } @@ -2015,7 +2038,7 @@ public com.google.bigtable.admin.v2.CreateClusterRequest.Builder getOriginalRequ * @return Whether the requestTime field is set. */ public boolean hasRequestTime() { - return requestTimeBuilder_ != null || requestTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -2052,11 +2075,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } requestTime_ = value; - onChanged(); } else { requestTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2071,11 +2094,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (requestTimeBuilder_ == null) { requestTime_ = builderForValue.build(); - onChanged(); } else { requestTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2089,19 +2112,18 @@ public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForVa */ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { if (requestTimeBuilder_ == null) { - if (requestTime_ != null) { - requestTime_ = - com.google.protobuf.Timestamp.newBuilder(requestTime_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && requestTime_ != null + && requestTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getRequestTimeBuilder().mergeFrom(value); } else { requestTime_ = value; } - onChanged(); } else { requestTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2114,14 +2136,13 @@ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp request_time = 2; */ public Builder clearRequestTime() { - if (requestTimeBuilder_ == null) { - requestTime_ = null; - onChanged(); - } else { - requestTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -2134,7 +2155,7 @@ public Builder clearRequestTime() { * .google.protobuf.Timestamp request_time = 2; */ public com.google.protobuf.Timestamp.Builder getRequestTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRequestTimeFieldBuilder().getBuilder(); } @@ -2200,7 +2221,7 @@ public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { * @return Whether the finishTime field is set. */ public boolean hasFinishTime() { - return finishTimeBuilder_ != null || finishTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -2237,11 +2258,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } finishTime_ = value; - onChanged(); } else { finishTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2256,11 +2277,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (finishTimeBuilder_ == null) { finishTime_ = builderForValue.build(); - onChanged(); } else { finishTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2274,17 +2295,18 @@ public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { if (finishTimeBuilder_ == null) { - if (finishTime_ != null) { - finishTime_ = - com.google.protobuf.Timestamp.newBuilder(finishTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && finishTime_ != null + && finishTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getFinishTimeBuilder().mergeFrom(value); } else { finishTime_ = value; } - onChanged(); } else { finishTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2297,14 +2319,13 @@ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp finish_time = 3; */ public Builder clearFinishTime() { - if (finishTimeBuilder_ == null) { - finishTime_ = null; - onChanged(); - } else { - finishTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -2317,7 +2338,7 @@ public Builder clearFinishTime() { * .google.protobuf.Timestamp finish_time = 3; */ public com.google.protobuf.Timestamp.Builder getFinishTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getFinishTimeFieldBuilder().getBuilder(); } @@ -2381,14 +2402,14 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() { private com.google.protobuf.MapField< java.lang.String, com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress> internalGetMutableTables() { - onChanged(); - ; if (tables_ == null) { tables_ = com.google.protobuf.MapField.newMapField(TablesDefaultEntryHolder.defaultEntry); } if (!tables_.isMutable()) { tables_ = tables_.copy(); } + bitField0_ |= 0x00000008; + onChanged(); return tables_; } @@ -2468,9 +2489,11 @@ public boolean containsTables(java.lang.String key) { * */ @java.lang.Override - public com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress getTablesOrDefault( - java.lang.String key, - com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress defaultValue) { + public /* nullable */ com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress + getTablesOrDefault( + java.lang.String key, + /* nullable */ + com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -2512,6 +2535,7 @@ public com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress getTable } public Builder clearTables() { + bitField0_ = (bitField0_ & ~0x00000008); internalGetMutableTables().getMutableMap().clear(); return this; } @@ -2544,6 +2568,7 @@ public Builder removeTables(java.lang.String key) { public java.util.Map< java.lang.String, com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress> getMutableTables() { + bitField0_ |= 0x00000008; return internalGetMutableTables().getMutableMap(); } /** @@ -2572,8 +2597,8 @@ public Builder putTables( if (value == null) { throw new NullPointerException("map value"); } - internalGetMutableTables().getMutableMap().put(key, value); + bitField0_ |= 0x00000008; return this; } /** @@ -2598,6 +2623,7 @@ public Builder putAllTables( java.lang.String, com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress> values) { internalGetMutableTables().getMutableMap().putAll(values); + bitField0_ |= 0x00000008; return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadataOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadataOrBuilder.java index dde9742012..af91227109 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadataOrBuilder.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadataOrBuilder.java @@ -204,7 +204,6 @@ public interface CreateClusterMetadataOrBuilder * map<string, .google.bigtable.admin.v2.CreateClusterMetadata.TableProgress> tables = 4; * */ - /* nullable */ com.google.bigtable.admin.v2.CreateClusterMetadata.TableProgress getTablesOrDefault( java.lang.String key, diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java index f6666ab297..a3f673d6ae 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int CLUSTER_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object clusterId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object clusterId_ = ""; /** * * @@ -227,7 +231,7 @@ public com.google.bigtable.admin.v2.Cluster getCluster() { */ @java.lang.Override public com.google.bigtable.admin.v2.ClusterOrBuilder getClusterOrBuilder() { - return getCluster(); + return cluster_ == null ? com.google.bigtable.admin.v2.Cluster.getDefaultInstance() : cluster_; } private byte memoizedIsInitialized = -1; @@ -450,14 +454,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - clusterId_ = ""; - - if (clusterBuilder_ == null) { - cluster_ = null; - } else { - cluster_ = null; + cluster_ = null; + if (clusterBuilder_ != null) { + clusterBuilder_.dispose(); clusterBuilder_ = null; } return this; @@ -487,17 +489,26 @@ public com.google.bigtable.admin.v2.CreateClusterRequest build() { public com.google.bigtable.admin.v2.CreateClusterRequest buildPartial() { com.google.bigtable.admin.v2.CreateClusterRequest result = new com.google.bigtable.admin.v2.CreateClusterRequest(this); - result.parent_ = parent_; - result.clusterId_ = clusterId_; - if (clusterBuilder_ == null) { - result.cluster_ = cluster_; - } else { - result.cluster_ = clusterBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.CreateClusterRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.clusterId_ = clusterId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.cluster_ = clusterBuilder_ == null ? cluster_ : clusterBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -546,10 +557,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateClusterRequest other return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getClusterId().isEmpty()) { clusterId_ = other.clusterId_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasCluster()) { @@ -584,19 +597,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { clusterId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getClusterFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -616,6 +629,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -689,8 +704,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -710,8 +725,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -736,8 +751,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -809,8 +824,8 @@ public Builder setClusterId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - clusterId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -828,8 +843,8 @@ public Builder setClusterId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearClusterId() { - clusterId_ = getDefaultInstance().getClusterId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -852,8 +867,8 @@ public Builder setClusterIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - clusterId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -879,7 +894,7 @@ public Builder setClusterIdBytes(com.google.protobuf.ByteString value) { * @return Whether the cluster field is set. */ public boolean hasCluster() { - return clusterBuilder_ != null || cluster_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -922,11 +937,11 @@ public Builder setCluster(com.google.bigtable.admin.v2.Cluster value) { throw new NullPointerException(); } cluster_ = value; - onChanged(); } else { clusterBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -944,11 +959,11 @@ public Builder setCluster(com.google.bigtable.admin.v2.Cluster value) { public Builder setCluster(com.google.bigtable.admin.v2.Cluster.Builder builderForValue) { if (clusterBuilder_ == null) { cluster_ = builderForValue.build(); - onChanged(); } else { clusterBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -965,19 +980,18 @@ public Builder setCluster(com.google.bigtable.admin.v2.Cluster.Builder builderFo */ public Builder mergeCluster(com.google.bigtable.admin.v2.Cluster value) { if (clusterBuilder_ == null) { - if (cluster_ != null) { - cluster_ = - com.google.bigtable.admin.v2.Cluster.newBuilder(cluster_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && cluster_ != null + && cluster_ != com.google.bigtable.admin.v2.Cluster.getDefaultInstance()) { + getClusterBuilder().mergeFrom(value); } else { cluster_ = value; } - onChanged(); } else { clusterBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -993,14 +1007,13 @@ public Builder mergeCluster(com.google.bigtable.admin.v2.Cluster value) { * */ public Builder clearCluster() { - if (clusterBuilder_ == null) { - cluster_ = null; - onChanged(); - } else { - cluster_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + cluster_ = null; + if (clusterBuilder_ != null) { + clusterBuilder_.dispose(); clusterBuilder_ = null; } - + onChanged(); return this; } /** @@ -1016,7 +1029,7 @@ public Builder clearCluster() { * */ public com.google.bigtable.admin.v2.Cluster.Builder getClusterBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getClusterFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java index 75394c9779..d4f1e0c37d 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java @@ -110,7 +110,9 @@ public com.google.bigtable.admin.v2.CreateInstanceRequest getOriginalRequest() { */ @java.lang.Override public com.google.bigtable.admin.v2.CreateInstanceRequestOrBuilder getOriginalRequestOrBuilder() { - return getOriginalRequest(); + return originalRequest_ == null + ? com.google.bigtable.admin.v2.CreateInstanceRequest.getDefaultInstance() + : originalRequest_; } public static final int REQUEST_TIME_FIELD_NUMBER = 2; @@ -156,7 +158,7 @@ public com.google.protobuf.Timestamp getRequestTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { - return getRequestTime(); + return requestTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : requestTime_; } public static final int FINISH_TIME_FIELD_NUMBER = 3; @@ -202,7 +204,7 @@ public com.google.protobuf.Timestamp getFinishTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() { - return getFinishTime(); + return finishTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : finishTime_; } private byte memoizedIsInitialized = -1; @@ -435,22 +437,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - } else { - originalRequest_ = null; + bitField0_ = 0; + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - if (requestTimeBuilder_ == null) { - requestTime_ = null; - } else { - requestTime_ = null; + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - if (finishTimeBuilder_ == null) { - finishTime_ = null; - } else { - finishTime_ = null; + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } return this; @@ -480,25 +480,28 @@ public com.google.bigtable.admin.v2.CreateInstanceMetadata build() { public com.google.bigtable.admin.v2.CreateInstanceMetadata buildPartial() { com.google.bigtable.admin.v2.CreateInstanceMetadata result = new com.google.bigtable.admin.v2.CreateInstanceMetadata(this); - if (originalRequestBuilder_ == null) { - result.originalRequest_ = originalRequest_; - } else { - result.originalRequest_ = originalRequestBuilder_.build(); - } - if (requestTimeBuilder_ == null) { - result.requestTime_ = requestTime_; - } else { - result.requestTime_ = requestTimeBuilder_.build(); - } - if (finishTimeBuilder_ == null) { - result.finishTime_ = finishTime_; - } else { - result.finishTime_ = finishTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.CreateInstanceMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.originalRequest_ = + originalRequestBuilder_ == null ? originalRequest_ : originalRequestBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.requestTime_ = + requestTimeBuilder_ == null ? requestTime_ : requestTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.finishTime_ = finishTimeBuilder_ == null ? finishTime_ : finishTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -583,19 +586,19 @@ public Builder mergeFrom( case 10: { input.readMessage(getOriginalRequestFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getRequestTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getFinishTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -615,6 +618,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.CreateInstanceRequest originalRequest_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.CreateInstanceRequest, @@ -633,7 +638,7 @@ public Builder mergeFrom( * @return Whether the originalRequest field is set. */ public boolean hasOriginalRequest() { - return originalRequestBuilder_ != null || originalRequest_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -670,11 +675,11 @@ public Builder setOriginalRequest(com.google.bigtable.admin.v2.CreateInstanceReq throw new NullPointerException(); } originalRequest_ = value; - onChanged(); } else { originalRequestBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -690,11 +695,11 @@ public Builder setOriginalRequest( com.google.bigtable.admin.v2.CreateInstanceRequest.Builder builderForValue) { if (originalRequestBuilder_ == null) { originalRequest_ = builderForValue.build(); - onChanged(); } else { originalRequestBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -708,19 +713,19 @@ public Builder setOriginalRequest( */ public Builder mergeOriginalRequest(com.google.bigtable.admin.v2.CreateInstanceRequest value) { if (originalRequestBuilder_ == null) { - if (originalRequest_ != null) { - originalRequest_ = - com.google.bigtable.admin.v2.CreateInstanceRequest.newBuilder(originalRequest_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && originalRequest_ != null + && originalRequest_ + != com.google.bigtable.admin.v2.CreateInstanceRequest.getDefaultInstance()) { + getOriginalRequestBuilder().mergeFrom(value); } else { originalRequest_ = value; } - onChanged(); } else { originalRequestBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -733,14 +738,13 @@ public Builder mergeOriginalRequest(com.google.bigtable.admin.v2.CreateInstanceR * .google.bigtable.admin.v2.CreateInstanceRequest original_request = 1; */ public Builder clearOriginalRequest() { - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - onChanged(); - } else { - originalRequest_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - + onChanged(); return this; } /** @@ -753,7 +757,7 @@ public Builder clearOriginalRequest() { * .google.bigtable.admin.v2.CreateInstanceRequest original_request = 1; */ public com.google.bigtable.admin.v2.CreateInstanceRequest.Builder getOriginalRequestBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getOriginalRequestFieldBuilder().getBuilder(); } @@ -820,7 +824,7 @@ public com.google.bigtable.admin.v2.CreateInstanceRequest.Builder getOriginalReq * @return Whether the requestTime field is set. */ public boolean hasRequestTime() { - return requestTimeBuilder_ != null || requestTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -857,11 +861,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } requestTime_ = value; - onChanged(); } else { requestTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -876,11 +880,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (requestTimeBuilder_ == null) { requestTime_ = builderForValue.build(); - onChanged(); } else { requestTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -894,19 +898,18 @@ public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForVa */ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { if (requestTimeBuilder_ == null) { - if (requestTime_ != null) { - requestTime_ = - com.google.protobuf.Timestamp.newBuilder(requestTime_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && requestTime_ != null + && requestTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getRequestTimeBuilder().mergeFrom(value); } else { requestTime_ = value; } - onChanged(); } else { requestTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -919,14 +922,13 @@ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp request_time = 2; */ public Builder clearRequestTime() { - if (requestTimeBuilder_ == null) { - requestTime_ = null; - onChanged(); - } else { - requestTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -939,7 +941,7 @@ public Builder clearRequestTime() { * .google.protobuf.Timestamp request_time = 2; */ public com.google.protobuf.Timestamp.Builder getRequestTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRequestTimeFieldBuilder().getBuilder(); } @@ -1005,7 +1007,7 @@ public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { * @return Whether the finishTime field is set. */ public boolean hasFinishTime() { - return finishTimeBuilder_ != null || finishTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1042,11 +1044,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } finishTime_ = value; - onChanged(); } else { finishTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1061,11 +1063,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (finishTimeBuilder_ == null) { finishTime_ = builderForValue.build(); - onChanged(); } else { finishTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1079,17 +1081,18 @@ public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { if (finishTimeBuilder_ == null) { - if (finishTime_ != null) { - finishTime_ = - com.google.protobuf.Timestamp.newBuilder(finishTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && finishTime_ != null + && finishTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getFinishTimeBuilder().mergeFrom(value); } else { finishTime_ = value; } - onChanged(); } else { finishTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1102,14 +1105,13 @@ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp finish_time = 3; */ public Builder clearFinishTime() { - if (finishTimeBuilder_ == null) { - finishTime_ = null; - onChanged(); - } else { - finishTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1122,7 +1124,7 @@ public Builder clearFinishTime() { * .google.protobuf.Timestamp finish_time = 3; */ public com.google.protobuf.Timestamp.Builder getFinishTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getFinishTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java index 0b74c6577f..cdaef14b49 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java @@ -80,7 +80,9 @@ protected com.google.protobuf.MapField internalGetMapField(int number) { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -135,7 +137,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int INSTANCE_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object instanceId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object instanceId_ = ""; /** * * @@ -241,7 +245,9 @@ public com.google.bigtable.admin.v2.Instance getInstance() { */ @java.lang.Override public com.google.bigtable.admin.v2.InstanceOrBuilder getInstanceOrBuilder() { - return getInstance(); + return instance_ == null + ? com.google.bigtable.admin.v2.Instance.getDefaultInstance() + : instance_; } public static final int CLUSTERS_FIELD_NUMBER = 4; @@ -260,6 +266,7 @@ private static final class ClustersDefaultEntryHolder { com.google.bigtable.admin.v2.Cluster.getDefaultInstance()); } + @SuppressWarnings("serial") private com.google.protobuf.MapField clusters_; @@ -337,8 +344,10 @@ public java.util.Map get * */ @java.lang.Override - public com.google.bigtable.admin.v2.Cluster getClustersOrDefault( - java.lang.String key, com.google.bigtable.admin.v2.Cluster defaultValue) { + public /* nullable */ com.google.bigtable.admin.v2.Cluster getClustersOrDefault( + java.lang.String key, + /* nullable */ + com.google.bigtable.admin.v2.Cluster defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -632,14 +641,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - instanceId_ = ""; - - if (instanceBuilder_ == null) { - instance_ = null; - } else { - instance_ = null; + instance_ = null; + if (instanceBuilder_ != null) { + instanceBuilder_.dispose(); instanceBuilder_ = null; } internalGetMutableClusters().clear(); @@ -670,20 +677,30 @@ public com.google.bigtable.admin.v2.CreateInstanceRequest build() { public com.google.bigtable.admin.v2.CreateInstanceRequest buildPartial() { com.google.bigtable.admin.v2.CreateInstanceRequest result = new com.google.bigtable.admin.v2.CreateInstanceRequest(this); - int from_bitField0_ = bitField0_; - result.parent_ = parent_; - result.instanceId_ = instanceId_; - if (instanceBuilder_ == null) { - result.instance_ = instance_; - } else { - result.instance_ = instanceBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.clusters_ = internalGetClusters(); - result.clusters_.makeImmutable(); onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.CreateInstanceRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.instanceId_ = instanceId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.instance_ = instanceBuilder_ == null ? instance_ : instanceBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.clusters_ = internalGetClusters(); + result.clusters_.makeImmutable(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -732,16 +749,19 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateInstanceRequest othe return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getInstanceId().isEmpty()) { instanceId_ = other.instanceId_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasInstance()) { mergeInstance(other.getInstance()); } internalGetMutableClusters().mergeFrom(other.internalGetClusters()); + bitField0_ |= 0x00000008; this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -771,19 +791,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { instanceId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getInstanceFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: @@ -796,6 +816,7 @@ public Builder mergeFrom( internalGetMutableClusters() .getMutableMap() .put(clusters__.getKey(), clusters__.getValue()); + bitField0_ |= 0x00000008; break; } // case 34 default: @@ -887,8 +908,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -907,8 +928,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -932,8 +953,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1005,8 +1026,8 @@ public Builder setInstanceId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - instanceId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1024,8 +1045,8 @@ public Builder setInstanceId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearInstanceId() { - instanceId_ = getDefaultInstance().getInstanceId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1048,8 +1069,8 @@ public Builder setInstanceIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - instanceId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1075,7 +1096,7 @@ public Builder setInstanceIdBytes(com.google.protobuf.ByteString value) { * @return Whether the instance field is set. */ public boolean hasInstance() { - return instanceBuilder_ != null || instance_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1118,11 +1139,11 @@ public Builder setInstance(com.google.bigtable.admin.v2.Instance value) { throw new NullPointerException(); } instance_ = value; - onChanged(); } else { instanceBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1140,11 +1161,11 @@ public Builder setInstance(com.google.bigtable.admin.v2.Instance value) { public Builder setInstance(com.google.bigtable.admin.v2.Instance.Builder builderForValue) { if (instanceBuilder_ == null) { instance_ = builderForValue.build(); - onChanged(); } else { instanceBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1161,19 +1182,18 @@ public Builder setInstance(com.google.bigtable.admin.v2.Instance.Builder builder */ public Builder mergeInstance(com.google.bigtable.admin.v2.Instance value) { if (instanceBuilder_ == null) { - if (instance_ != null) { - instance_ = - com.google.bigtable.admin.v2.Instance.newBuilder(instance_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && instance_ != null + && instance_ != com.google.bigtable.admin.v2.Instance.getDefaultInstance()) { + getInstanceBuilder().mergeFrom(value); } else { instance_ = value; } - onChanged(); } else { instanceBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1189,14 +1209,13 @@ public Builder mergeInstance(com.google.bigtable.admin.v2.Instance value) { * */ public Builder clearInstance() { - if (instanceBuilder_ == null) { - instance_ = null; - onChanged(); - } else { - instance_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + instance_ = null; + if (instanceBuilder_ != null) { + instanceBuilder_.dispose(); instanceBuilder_ = null; } - + onChanged(); return this; } /** @@ -1212,7 +1231,7 @@ public Builder clearInstance() { * */ public com.google.bigtable.admin.v2.Instance.Builder getInstanceBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getInstanceFieldBuilder().getBuilder(); } @@ -1279,8 +1298,6 @@ public com.google.bigtable.admin.v2.InstanceOrBuilder getInstanceOrBuilder() { private com.google.protobuf.MapField internalGetMutableClusters() { - onChanged(); - ; if (clusters_ == null) { clusters_ = com.google.protobuf.MapField.newMapField(ClustersDefaultEntryHolder.defaultEntry); @@ -1288,6 +1305,8 @@ public com.google.bigtable.admin.v2.InstanceOrBuilder getInstanceOrBuilder() { if (!clusters_.isMutable()) { clusters_ = clusters_.copy(); } + bitField0_ |= 0x00000008; + onChanged(); return clusters_; } @@ -1357,8 +1376,10 @@ public java.util.Map get * */ @java.lang.Override - public com.google.bigtable.admin.v2.Cluster getClustersOrDefault( - java.lang.String key, com.google.bigtable.admin.v2.Cluster defaultValue) { + public /* nullable */ com.google.bigtable.admin.v2.Cluster getClustersOrDefault( + java.lang.String key, + /* nullable */ + com.google.bigtable.admin.v2.Cluster defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -1395,6 +1416,7 @@ public com.google.bigtable.admin.v2.Cluster getClustersOrThrow(java.lang.String } public Builder clearClusters() { + bitField0_ = (bitField0_ & ~0x00000008); internalGetMutableClusters().getMutableMap().clear(); return this; } @@ -1424,6 +1446,7 @@ public Builder removeClusters(java.lang.String key) { @java.lang.Deprecated public java.util.Map getMutableClusters() { + bitField0_ |= 0x00000008; return internalGetMutableClusters().getMutableMap(); } /** @@ -1448,8 +1471,8 @@ public Builder putClusters(java.lang.String key, com.google.bigtable.admin.v2.Cl if (value == null) { throw new NullPointerException("map value"); } - internalGetMutableClusters().getMutableMap().put(key, value); + bitField0_ |= 0x00000008; return this; } /** @@ -1470,6 +1493,7 @@ public Builder putClusters(java.lang.String key, com.google.bigtable.admin.v2.Cl public Builder putAllClusters( java.util.Map values) { internalGetMutableClusters().getMutableMap().putAll(values); + bitField0_ |= 0x00000008; return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequestOrBuilder.java index 28f763e442..1a262655f7 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequestOrBuilder.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequestOrBuilder.java @@ -193,7 +193,6 @@ public interface CreateInstanceRequestOrBuilder * map<string, .google.bigtable.admin.v2.Cluster> clusters = 4 [(.google.api.field_behavior) = REQUIRED]; * */ - /* nullable */ com.google.bigtable.admin.v2.Cluster getClustersOrDefault( java.lang.String key, diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java index cb326cf4ce..6af1bda462 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java @@ -119,7 +119,9 @@ public com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest getOriginalRe @java.lang.Override public com.google.bigtable.admin.v2.CreateTableFromSnapshotRequestOrBuilder getOriginalRequestOrBuilder() { - return getOriginalRequest(); + return originalRequest_ == null + ? com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest.getDefaultInstance() + : originalRequest_; } public static final int REQUEST_TIME_FIELD_NUMBER = 2; @@ -165,7 +167,7 @@ public com.google.protobuf.Timestamp getRequestTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { - return getRequestTime(); + return requestTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : requestTime_; } public static final int FINISH_TIME_FIELD_NUMBER = 3; @@ -211,7 +213,7 @@ public com.google.protobuf.Timestamp getFinishTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() { - return getFinishTime(); + return finishTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : finishTime_; } private byte memoizedIsInitialized = -1; @@ -449,22 +451,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - } else { - originalRequest_ = null; + bitField0_ = 0; + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - if (requestTimeBuilder_ == null) { - requestTime_ = null; - } else { - requestTime_ = null; + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - if (finishTimeBuilder_ == null) { - finishTime_ = null; - } else { - finishTime_ = null; + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } return this; @@ -495,25 +495,29 @@ public com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata build() { public com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata buildPartial() { com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata result = new com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata(this); - if (originalRequestBuilder_ == null) { - result.originalRequest_ = originalRequest_; - } else { - result.originalRequest_ = originalRequestBuilder_.build(); - } - if (requestTimeBuilder_ == null) { - result.requestTime_ = requestTime_; - } else { - result.requestTime_ = requestTimeBuilder_.build(); - } - if (finishTimeBuilder_ == null) { - result.finishTime_ = finishTime_; - } else { - result.finishTime_ = finishTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.originalRequest_ = + originalRequestBuilder_ == null ? originalRequest_ : originalRequestBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.requestTime_ = + requestTimeBuilder_ == null ? requestTime_ : requestTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.finishTime_ = finishTimeBuilder_ == null ? finishTime_ : finishTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -599,19 +603,19 @@ public Builder mergeFrom( case 10: { input.readMessage(getOriginalRequestFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getRequestTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getFinishTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -631,6 +635,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest originalRequest_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest, @@ -650,7 +656,7 @@ public Builder mergeFrom( * @return Whether the originalRequest field is set. */ public boolean hasOriginalRequest() { - return originalRequestBuilder_ != null || originalRequest_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -690,11 +696,11 @@ public Builder setOriginalRequest( throw new NullPointerException(); } originalRequest_ = value; - onChanged(); } else { originalRequestBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -711,11 +717,11 @@ public Builder setOriginalRequest( com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest.Builder builderForValue) { if (originalRequestBuilder_ == null) { originalRequest_ = builderForValue.build(); - onChanged(); } else { originalRequestBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -731,20 +737,20 @@ public Builder setOriginalRequest( public Builder mergeOriginalRequest( com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest value) { if (originalRequestBuilder_ == null) { - if (originalRequest_ != null) { - originalRequest_ = - com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest.newBuilder( - originalRequest_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && originalRequest_ != null + && originalRequest_ + != com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest + .getDefaultInstance()) { + getOriginalRequestBuilder().mergeFrom(value); } else { originalRequest_ = value; } - onChanged(); } else { originalRequestBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -758,14 +764,13 @@ public Builder mergeOriginalRequest( * .google.bigtable.admin.v2.CreateTableFromSnapshotRequest original_request = 1; */ public Builder clearOriginalRequest() { - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - onChanged(); - } else { - originalRequest_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - + onChanged(); return this; } /** @@ -780,7 +785,7 @@ public Builder clearOriginalRequest() { */ public com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest.Builder getOriginalRequestBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getOriginalRequestFieldBuilder().getBuilder(); } @@ -849,7 +854,7 @@ public Builder clearOriginalRequest() { * @return Whether the requestTime field is set. */ public boolean hasRequestTime() { - return requestTimeBuilder_ != null || requestTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -886,11 +891,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } requestTime_ = value; - onChanged(); } else { requestTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -905,11 +910,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (requestTimeBuilder_ == null) { requestTime_ = builderForValue.build(); - onChanged(); } else { requestTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -923,19 +928,18 @@ public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForVa */ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { if (requestTimeBuilder_ == null) { - if (requestTime_ != null) { - requestTime_ = - com.google.protobuf.Timestamp.newBuilder(requestTime_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && requestTime_ != null + && requestTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getRequestTimeBuilder().mergeFrom(value); } else { requestTime_ = value; } - onChanged(); } else { requestTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -948,14 +952,13 @@ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp request_time = 2; */ public Builder clearRequestTime() { - if (requestTimeBuilder_ == null) { - requestTime_ = null; - onChanged(); - } else { - requestTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -968,7 +971,7 @@ public Builder clearRequestTime() { * .google.protobuf.Timestamp request_time = 2; */ public com.google.protobuf.Timestamp.Builder getRequestTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRequestTimeFieldBuilder().getBuilder(); } @@ -1034,7 +1037,7 @@ public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { * @return Whether the finishTime field is set. */ public boolean hasFinishTime() { - return finishTimeBuilder_ != null || finishTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1071,11 +1074,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } finishTime_ = value; - onChanged(); } else { finishTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1090,11 +1093,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (finishTimeBuilder_ == null) { finishTime_ = builderForValue.build(); - onChanged(); } else { finishTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1108,17 +1111,18 @@ public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { if (finishTimeBuilder_ == null) { - if (finishTime_ != null) { - finishTime_ = - com.google.protobuf.Timestamp.newBuilder(finishTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && finishTime_ != null + && finishTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getFinishTimeBuilder().mergeFrom(value); } else { finishTime_ = value; } - onChanged(); } else { finishTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1131,14 +1135,13 @@ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp finish_time = 3; */ public Builder clearFinishTime() { - if (finishTimeBuilder_ == null) { - finishTime_ = null; - onChanged(); - } else { - finishTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1151,7 +1154,7 @@ public Builder clearFinishTime() { * .google.protobuf.Timestamp finish_time = 3; */ public com.google.protobuf.Timestamp.Builder getFinishTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getFinishTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java index 392837847b..1758eca5f3 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java @@ -76,7 +76,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -131,7 +133,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int TABLE_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object tableId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object tableId_ = ""; /** * * @@ -182,7 +186,9 @@ public com.google.protobuf.ByteString getTableIdBytes() { } public static final int SOURCE_SNAPSHOT_FIELD_NUMBER = 3; - private volatile java.lang.Object sourceSnapshot_; + + @SuppressWarnings("serial") + private volatile java.lang.Object sourceSnapshot_ = ""; /** * * @@ -461,12 +467,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - tableId_ = ""; - sourceSnapshot_ = ""; - return this; } @@ -494,13 +498,26 @@ public com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest build() { public com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest buildPartial() { com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest result = new com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest(this); - result.parent_ = parent_; - result.tableId_ = tableId_; - result.sourceSnapshot_ = sourceSnapshot_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.tableId_ = tableId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.sourceSnapshot_ = sourceSnapshot_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -549,14 +566,17 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateTableFromSnapshotReq return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getTableId().isEmpty()) { tableId_ = other.tableId_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getSourceSnapshot().isEmpty()) { sourceSnapshot_ = other.sourceSnapshot_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -588,19 +608,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { tableId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { sourceSnapshot_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -620,6 +640,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -690,8 +712,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -710,8 +732,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -735,8 +757,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -805,8 +827,8 @@ public Builder setTableId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - tableId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -823,8 +845,8 @@ public Builder setTableId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTableId() { - tableId_ = getDefaultInstance().getTableId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -846,8 +868,8 @@ public Builder setTableIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - tableId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -928,8 +950,8 @@ public Builder setSourceSnapshot(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - sourceSnapshot_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -950,8 +972,8 @@ public Builder setSourceSnapshot(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSourceSnapshot() { - sourceSnapshot_ = getDefaultInstance().getSourceSnapshot(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -977,8 +999,8 @@ public Builder setSourceSnapshotBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - sourceSnapshot_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java index f5d6c6f995..d6c85cbcc4 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java @@ -138,7 +138,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int KEY_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString key_; + private com.google.protobuf.ByteString key_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -355,8 +355,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; key_ = com.google.protobuf.ByteString.EMPTY; - return this; } @@ -384,11 +384,20 @@ public com.google.bigtable.admin.v2.CreateTableRequest.Split build() { public com.google.bigtable.admin.v2.CreateTableRequest.Split buildPartial() { com.google.bigtable.admin.v2.CreateTableRequest.Split result = new com.google.bigtable.admin.v2.CreateTableRequest.Split(this); - result.key_ = key_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.CreateTableRequest.Split result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.key_ = key_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -469,7 +478,7 @@ public Builder mergeFrom( case 10: { key_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -489,6 +498,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.ByteString key_ = com.google.protobuf.ByteString.EMPTY; /** * @@ -521,8 +532,8 @@ public Builder setKey(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - key_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -538,7 +549,7 @@ public Builder setKey(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearKey() { - + bitField0_ = (bitField0_ & ~0x00000001); key_ = getDefaultInstance().getKey(); onChanged(); return this; @@ -609,7 +620,9 @@ public com.google.bigtable.admin.v2.CreateTableRequest.Split getDefaultInstanceF } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -664,7 +677,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int TABLE_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object tableId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object tableId_ = ""; /** * * @@ -762,10 +777,12 @@ public com.google.bigtable.admin.v2.Table getTable() { */ @java.lang.Override public com.google.bigtable.admin.v2.TableOrBuilder getTableOrBuilder() { - return getTable(); + return table_ == null ? com.google.bigtable.admin.v2.Table.getDefaultInstance() : table_; } public static final int INITIAL_SPLITS_FIELD_NUMBER = 4; + + @SuppressWarnings("serial") private java.util.List initialSplits_; /** * @@ -1133,14 +1150,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - tableId_ = ""; - - if (tableBuilder_ == null) { - table_ = null; - } else { - table_ = null; + table_ = null; + if (tableBuilder_ != null) { + tableBuilder_.dispose(); tableBuilder_ = null; } if (initialSplitsBuilder_ == null) { @@ -1149,7 +1164,7 @@ public Builder clear() { initialSplits_ = null; initialSplitsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -1177,25 +1192,38 @@ public com.google.bigtable.admin.v2.CreateTableRequest build() { public com.google.bigtable.admin.v2.CreateTableRequest buildPartial() { com.google.bigtable.admin.v2.CreateTableRequest result = new com.google.bigtable.admin.v2.CreateTableRequest(this); - int from_bitField0_ = bitField0_; - result.parent_ = parent_; - result.tableId_ = tableId_; - if (tableBuilder_ == null) { - result.table_ = table_; - } else { - result.table_ = tableBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.CreateTableRequest result) { if (initialSplitsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000008) != 0)) { initialSplits_ = java.util.Collections.unmodifiableList(initialSplits_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } result.initialSplits_ = initialSplits_; } else { result.initialSplits_ = initialSplitsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.CreateTableRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.tableId_ = tableId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.table_ = tableBuilder_ == null ? table_ : tableBuilder_.build(); + } } @java.lang.Override @@ -1246,10 +1274,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateTableRequest other) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getTableId().isEmpty()) { tableId_ = other.tableId_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasTable()) { @@ -1259,7 +1289,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateTableRequest other) if (!other.initialSplits_.isEmpty()) { if (initialSplits_.isEmpty()) { initialSplits_ = other.initialSplits_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureInitialSplitsIsMutable(); initialSplits_.addAll(other.initialSplits_); @@ -1272,7 +1302,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateTableRequest other) initialSplitsBuilder_.dispose(); initialSplitsBuilder_ = null; initialSplits_ = other.initialSplits_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); initialSplitsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getInitialSplitsFieldBuilder() @@ -1311,19 +1341,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { tableId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getTableFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: @@ -1429,8 +1459,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1449,8 +1479,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1474,8 +1504,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1547,8 +1577,8 @@ public Builder setTableId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - tableId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1566,8 +1596,8 @@ public Builder setTableId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTableId() { - tableId_ = getDefaultInstance().getTableId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1590,8 +1620,8 @@ public Builder setTableIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - tableId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1615,7 +1645,7 @@ public Builder setTableIdBytes(com.google.protobuf.ByteString value) { * @return Whether the table field is set. */ public boolean hasTable() { - return tableBuilder_ != null || table_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1652,11 +1682,11 @@ public Builder setTable(com.google.bigtable.admin.v2.Table value) { throw new NullPointerException(); } table_ = value; - onChanged(); } else { tableBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1672,11 +1702,11 @@ public Builder setTable(com.google.bigtable.admin.v2.Table value) { public Builder setTable(com.google.bigtable.admin.v2.Table.Builder builderForValue) { if (tableBuilder_ == null) { table_ = builderForValue.build(); - onChanged(); } else { tableBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1691,17 +1721,18 @@ public Builder setTable(com.google.bigtable.admin.v2.Table.Builder builderForVal */ public Builder mergeTable(com.google.bigtable.admin.v2.Table value) { if (tableBuilder_ == null) { - if (table_ != null) { - table_ = - com.google.bigtable.admin.v2.Table.newBuilder(table_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && table_ != null + && table_ != com.google.bigtable.admin.v2.Table.getDefaultInstance()) { + getTableBuilder().mergeFrom(value); } else { table_ = value; } - onChanged(); } else { tableBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1715,14 +1746,13 @@ public Builder mergeTable(com.google.bigtable.admin.v2.Table value) { * */ public Builder clearTable() { - if (tableBuilder_ == null) { - table_ = null; - onChanged(); - } else { - table_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + table_ = null; + if (tableBuilder_ != null) { + tableBuilder_.dispose(); tableBuilder_ = null; } - + onChanged(); return this; } /** @@ -1736,7 +1766,7 @@ public Builder clearTable() { * */ public com.google.bigtable.admin.v2.Table.Builder getTableBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getTableFieldBuilder().getBuilder(); } @@ -1788,11 +1818,11 @@ public com.google.bigtable.admin.v2.TableOrBuilder getTableOrBuilder() { java.util.Collections.emptyList(); private void ensureInitialSplitsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000008) != 0)) { initialSplits_ = new java.util.ArrayList( initialSplits_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000008; } } @@ -2155,7 +2185,7 @@ public Builder addAllInitialSplits( public Builder clearInitialSplits() { if (initialSplitsBuilder_ == null) { initialSplits_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { initialSplitsBuilder_.clear(); @@ -2373,7 +2403,7 @@ public com.google.bigtable.admin.v2.CreateTableRequest.Split.Builder addInitialS com.google.bigtable.admin.v2.CreateTableRequest.Split.Builder, com.google.bigtable.admin.v2.CreateTableRequest.SplitOrBuilder>( initialSplits_, - ((bitField0_ & 0x00000001) != 0), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); initialSplits_ = null; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java index 4a85712a9f..c8257d729e 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -123,7 +125,7 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int IGNORE_WARNINGS_FIELD_NUMBER = 2; - private boolean ignoreWarnings_; + private boolean ignoreWarnings_ = false; /** * * @@ -346,10 +348,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - ignoreWarnings_ = false; - return this; } @@ -377,12 +378,23 @@ public com.google.bigtable.admin.v2.DeleteAppProfileRequest build() { public com.google.bigtable.admin.v2.DeleteAppProfileRequest buildPartial() { com.google.bigtable.admin.v2.DeleteAppProfileRequest result = new com.google.bigtable.admin.v2.DeleteAppProfileRequest(this); - result.name_ = name_; - result.ignoreWarnings_ = ignoreWarnings_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.DeleteAppProfileRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.ignoreWarnings_ = ignoreWarnings_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -431,6 +443,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DeleteAppProfileRequest ot return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getIgnoreWarnings() != false) { @@ -465,13 +478,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { ignoreWarnings_ = input.readBool(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -491,6 +504,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -561,8 +576,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -581,8 +596,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -606,8 +621,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -643,6 +658,7 @@ public boolean getIgnoreWarnings() { public Builder setIgnoreWarnings(boolean value) { ignoreWarnings_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -658,7 +674,7 @@ public Builder setIgnoreWarnings(boolean value) { * @return This builder for chaining. */ public Builder clearIgnoreWarnings() { - + bitField0_ = (bitField0_ & ~0x00000002); ignoreWarnings_ = false; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteBackupRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteBackupRequest.java index 332e0ce5a6..61d7632d7f 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteBackupRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteBackupRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -350,11 +352,20 @@ public com.google.bigtable.admin.v2.DeleteBackupRequest build() { public com.google.bigtable.admin.v2.DeleteBackupRequest buildPartial() { com.google.bigtable.admin.v2.DeleteBackupRequest result = new com.google.bigtable.admin.v2.DeleteBackupRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.DeleteBackupRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -403,6 +414,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DeleteBackupRequest other) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -434,7 +446,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -454,6 +466,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -527,8 +541,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -548,8 +562,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -574,8 +588,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java index 35c1a6a376..87079dce8c 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -348,11 +350,20 @@ public com.google.bigtable.admin.v2.DeleteClusterRequest build() { public com.google.bigtable.admin.v2.DeleteClusterRequest buildPartial() { com.google.bigtable.admin.v2.DeleteClusterRequest result = new com.google.bigtable.admin.v2.DeleteClusterRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.DeleteClusterRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -401,6 +412,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DeleteClusterRequest other return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -432,7 +444,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -452,6 +464,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -522,8 +536,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -542,8 +556,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -567,8 +581,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java index b3b6da08f2..095485de05 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -348,11 +350,20 @@ public com.google.bigtable.admin.v2.DeleteInstanceRequest build() { public com.google.bigtable.admin.v2.DeleteInstanceRequest buildPartial() { com.google.bigtable.admin.v2.DeleteInstanceRequest result = new com.google.bigtable.admin.v2.DeleteInstanceRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.DeleteInstanceRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -401,6 +412,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DeleteInstanceRequest othe return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -432,7 +444,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -452,6 +464,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -522,8 +536,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -542,8 +556,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -567,8 +581,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java index 3f05f058f5..c9fa4d746c 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java @@ -73,7 +73,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -331,8 +333,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -360,11 +362,20 @@ public com.google.bigtable.admin.v2.DeleteSnapshotRequest build() { public com.google.bigtable.admin.v2.DeleteSnapshotRequest buildPartial() { com.google.bigtable.admin.v2.DeleteSnapshotRequest result = new com.google.bigtable.admin.v2.DeleteSnapshotRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.DeleteSnapshotRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -413,6 +424,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DeleteSnapshotRequest othe return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -444,7 +456,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -464,6 +476,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -537,8 +551,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -558,8 +572,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -584,8 +598,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java index 84a58dbf6a..4035df596a 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -323,8 +325,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -352,11 +354,20 @@ public com.google.bigtable.admin.v2.DeleteTableRequest build() { public com.google.bigtable.admin.v2.DeleteTableRequest buildPartial() { com.google.bigtable.admin.v2.DeleteTableRequest result = new com.google.bigtable.admin.v2.DeleteTableRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.DeleteTableRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -405,6 +416,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DeleteTableRequest other) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -436,7 +448,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -456,6 +468,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -529,8 +543,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -550,8 +564,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -576,8 +590,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java index 4239f2d91d..9bad838884 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java @@ -116,7 +116,9 @@ public TargetCase getTargetCase() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -481,8 +483,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - targetCase_ = 0; target_ = null; return this; @@ -512,18 +514,26 @@ public com.google.bigtable.admin.v2.DropRowRangeRequest build() { public com.google.bigtable.admin.v2.DropRowRangeRequest buildPartial() { com.google.bigtable.admin.v2.DropRowRangeRequest result = new com.google.bigtable.admin.v2.DropRowRangeRequest(this); - result.name_ = name_; - if (targetCase_ == 2) { - result.target_ = target_; - } - if (targetCase_ == 3) { - result.target_ = target_; + if (bitField0_ != 0) { + buildPartial0(result); } - result.targetCase_ = targetCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.DropRowRangeRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + + private void buildPartialOneofs(com.google.bigtable.admin.v2.DropRowRangeRequest result) { + result.targetCase_ = targetCase_; + result.target_ = this.target_; + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -572,6 +582,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DropRowRangeRequest other) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } switch (other.getTargetCase()) { @@ -619,7 +630,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -665,6 +676,8 @@ public Builder clearTarget() { return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -738,8 +751,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -759,8 +772,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -785,8 +798,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -911,6 +924,7 @@ public boolean getDeleteAllDataFromTable() { * @return This builder for chaining. */ public Builder setDeleteAllDataFromTable(boolean value) { + targetCase_ = 3; target_ = value; onChanged(); diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/EncryptionInfo.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/EncryptionInfo.java index d85b829aaa..07ba4b3432 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/EncryptionInfo.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/EncryptionInfo.java @@ -245,7 +245,7 @@ private EncryptionType(int value) { } public static final int ENCRYPTION_TYPE_FIELD_NUMBER = 3; - private int encryptionType_; + private int encryptionType_ = 0; /** * * @@ -278,9 +278,8 @@ public int getEncryptionTypeValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType getEncryptionType() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType result = - com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType.valueOf(encryptionType_); + com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType.forNumber(encryptionType_); return result == null ? com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType.UNRECOGNIZED : result; @@ -337,11 +336,15 @@ public com.google.rpc.Status getEncryptionStatus() { */ @java.lang.Override public com.google.rpc.StatusOrBuilder getEncryptionStatusOrBuilder() { - return getEncryptionStatus(); + return encryptionStatus_ == null + ? com.google.rpc.Status.getDefaultInstance() + : encryptionStatus_; } public static final int KMS_KEY_VERSION_FIELD_NUMBER = 2; - private volatile java.lang.Object kmsKeyVersion_; + + @SuppressWarnings("serial") + private volatile java.lang.Object kmsKeyVersion_ = ""; /** * * @@ -622,16 +625,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; encryptionType_ = 0; - - if (encryptionStatusBuilder_ == null) { - encryptionStatus_ = null; - } else { - encryptionStatus_ = null; + encryptionStatus_ = null; + if (encryptionStatusBuilder_ != null) { + encryptionStatusBuilder_.dispose(); encryptionStatusBuilder_ = null; } kmsKeyVersion_ = ""; - return this; } @@ -659,17 +660,27 @@ public com.google.bigtable.admin.v2.EncryptionInfo build() { public com.google.bigtable.admin.v2.EncryptionInfo buildPartial() { com.google.bigtable.admin.v2.EncryptionInfo result = new com.google.bigtable.admin.v2.EncryptionInfo(this); - result.encryptionType_ = encryptionType_; - if (encryptionStatusBuilder_ == null) { - result.encryptionStatus_ = encryptionStatus_; - } else { - result.encryptionStatus_ = encryptionStatusBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.kmsKeyVersion_ = kmsKeyVersion_; onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.EncryptionInfo result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.encryptionType_ = encryptionType_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.encryptionStatus_ = + encryptionStatusBuilder_ == null ? encryptionStatus_ : encryptionStatusBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.kmsKeyVersion_ = kmsKeyVersion_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -723,6 +734,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.EncryptionInfo other) { } if (!other.getKmsKeyVersion().isEmpty()) { kmsKeyVersion_ = other.kmsKeyVersion_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -754,20 +766,20 @@ public Builder mergeFrom( case 18: { kmsKeyVersion_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 18 case 24: { encryptionType_ = input.readEnum(); - + bitField0_ |= 0x00000001; break; } // case 24 case 34: { input.readMessage( getEncryptionStatusFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 34 default: @@ -787,6 +799,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int encryptionType_ = 0; /** * @@ -820,8 +834,8 @@ public int getEncryptionTypeValue() { * @return This builder for chaining. */ public Builder setEncryptionTypeValue(int value) { - encryptionType_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -840,9 +854,8 @@ public Builder setEncryptionTypeValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType getEncryptionType() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType result = - com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType.valueOf(encryptionType_); + com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType.forNumber(encryptionType_); return result == null ? com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType.UNRECOGNIZED : result; @@ -866,7 +879,7 @@ public Builder setEncryptionType( if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; encryptionType_ = value.getNumber(); onChanged(); return this; @@ -885,7 +898,7 @@ public Builder setEncryptionType( * @return This builder for chaining. */ public Builder clearEncryptionType() { - + bitField0_ = (bitField0_ & ~0x00000001); encryptionType_ = 0; onChanged(); return this; @@ -909,7 +922,7 @@ public Builder clearEncryptionType() { * @return Whether the encryptionStatus field is set. */ public boolean hasEncryptionStatus() { - return encryptionStatusBuilder_ != null || encryptionStatus_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -950,11 +963,11 @@ public Builder setEncryptionStatus(com.google.rpc.Status value) { throw new NullPointerException(); } encryptionStatus_ = value; - onChanged(); } else { encryptionStatusBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -971,11 +984,11 @@ public Builder setEncryptionStatus(com.google.rpc.Status value) { public Builder setEncryptionStatus(com.google.rpc.Status.Builder builderForValue) { if (encryptionStatusBuilder_ == null) { encryptionStatus_ = builderForValue.build(); - onChanged(); } else { encryptionStatusBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -991,17 +1004,18 @@ public Builder setEncryptionStatus(com.google.rpc.Status.Builder builderForValue */ public Builder mergeEncryptionStatus(com.google.rpc.Status value) { if (encryptionStatusBuilder_ == null) { - if (encryptionStatus_ != null) { - encryptionStatus_ = - com.google.rpc.Status.newBuilder(encryptionStatus_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && encryptionStatus_ != null + && encryptionStatus_ != com.google.rpc.Status.getDefaultInstance()) { + getEncryptionStatusBuilder().mergeFrom(value); } else { encryptionStatus_ = value; } - onChanged(); } else { encryptionStatusBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1016,14 +1030,13 @@ public Builder mergeEncryptionStatus(com.google.rpc.Status value) { * */ public Builder clearEncryptionStatus() { - if (encryptionStatusBuilder_ == null) { - encryptionStatus_ = null; - onChanged(); - } else { - encryptionStatus_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + encryptionStatus_ = null; + if (encryptionStatusBuilder_ != null) { + encryptionStatusBuilder_.dispose(); encryptionStatusBuilder_ = null; } - + onChanged(); return this; } /** @@ -1038,7 +1051,7 @@ public Builder clearEncryptionStatus() { * */ public com.google.rpc.Status.Builder getEncryptionStatusBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getEncryptionStatusFieldBuilder().getBuilder(); } @@ -1158,8 +1171,8 @@ public Builder setKmsKeyVersion(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - kmsKeyVersion_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1178,8 +1191,8 @@ public Builder setKmsKeyVersion(java.lang.String value) { * @return This builder for chaining. */ public Builder clearKmsKeyVersion() { - kmsKeyVersion_ = getDefaultInstance().getKmsKeyVersion(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1203,8 +1216,8 @@ public Builder setKmsKeyVersionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - kmsKeyVersion_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java index 5a3866c1bf..57238d3cbf 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java @@ -171,6 +171,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int RULES_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List rules_; /** * @@ -440,6 +442,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (rulesBuilder_ == null) { rules_ = java.util.Collections.emptyList(); } else { @@ -474,7 +477,16 @@ public com.google.bigtable.admin.v2.GcRule.Intersection build() { public com.google.bigtable.admin.v2.GcRule.Intersection buildPartial() { com.google.bigtable.admin.v2.GcRule.Intersection result = new com.google.bigtable.admin.v2.GcRule.Intersection(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.GcRule.Intersection result) { if (rulesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { rules_ = java.util.Collections.unmodifiableList(rules_); @@ -484,8 +496,10 @@ public com.google.bigtable.admin.v2.GcRule.Intersection buildPartial() { } else { result.rules_ = rulesBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.GcRule.Intersection result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -1139,6 +1153,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int RULES_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List rules_; /** * @@ -1408,6 +1424,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (rulesBuilder_ == null) { rules_ = java.util.Collections.emptyList(); } else { @@ -1442,7 +1459,15 @@ public com.google.bigtable.admin.v2.GcRule.Union build() { public com.google.bigtable.admin.v2.GcRule.Union buildPartial() { com.google.bigtable.admin.v2.GcRule.Union result = new com.google.bigtable.admin.v2.GcRule.Union(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.bigtable.admin.v2.GcRule.Union result) { if (rulesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { rules_ = java.util.Collections.unmodifiableList(rules_); @@ -1452,8 +1477,10 @@ public com.google.bigtable.admin.v2.GcRule.Union buildPartial() { } else { result.rules_ = rulesBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.GcRule.Union result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -2502,6 +2529,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (maxAgeBuilder_ != null) { maxAgeBuilder_.clear(); } @@ -2539,33 +2567,30 @@ public com.google.bigtable.admin.v2.GcRule build() { @java.lang.Override public com.google.bigtable.admin.v2.GcRule buildPartial() { com.google.bigtable.admin.v2.GcRule result = new com.google.bigtable.admin.v2.GcRule(this); - if (ruleCase_ == 1) { - result.rule_ = rule_; + if (bitField0_ != 0) { + buildPartial0(result); } - if (ruleCase_ == 2) { - if (maxAgeBuilder_ == null) { - result.rule_ = rule_; - } else { - result.rule_ = maxAgeBuilder_.build(); - } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.GcRule result) { + int from_bitField0_ = bitField0_; + } + + private void buildPartialOneofs(com.google.bigtable.admin.v2.GcRule result) { + result.ruleCase_ = ruleCase_; + result.rule_ = this.rule_; + if (ruleCase_ == 2 && maxAgeBuilder_ != null) { + result.rule_ = maxAgeBuilder_.build(); } - if (ruleCase_ == 3) { - if (intersectionBuilder_ == null) { - result.rule_ = rule_; - } else { - result.rule_ = intersectionBuilder_.build(); - } + if (ruleCase_ == 3 && intersectionBuilder_ != null) { + result.rule_ = intersectionBuilder_.build(); } - if (ruleCase_ == 4) { - if (unionBuilder_ == null) { - result.rule_ = rule_; - } else { - result.rule_ = unionBuilder_.build(); - } + if (ruleCase_ == 4 && unionBuilder_ != null) { + result.rule_ = unionBuilder_.build(); } - result.ruleCase_ = ruleCase_; - onBuilt(); - return result; } @java.lang.Override @@ -2720,6 +2745,8 @@ public Builder clearRule() { return this; } + private int bitField0_; + /** * * @@ -2764,6 +2791,7 @@ public int getMaxNumVersions() { * @return This builder for chaining. */ public Builder setMaxNumVersions(int value) { + ruleCase_ = 1; rule_ = value; onChanged(); @@ -3008,7 +3036,6 @@ public com.google.protobuf.DurationOrBuilder getMaxAgeOrBuilder() { } ruleCase_ = 2; onChanged(); - ; return maxAgeBuilder_; } @@ -3218,7 +3245,6 @@ public com.google.bigtable.admin.v2.GcRule.IntersectionOrBuilder getIntersection } ruleCase_ = 3; onChanged(); - ; return intersectionBuilder_; } @@ -3427,7 +3453,6 @@ public com.google.bigtable.admin.v2.GcRule.UnionOrBuilder getUnionOrBuilder() { } ruleCase_ = 4; onChanged(); - ; return unionBuilder_; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java index 15ae710e62..a9899aee5b 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -325,8 +327,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -355,11 +357,21 @@ public com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest build() { public com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest buildPartial() { com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest result = new com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -409,6 +421,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GenerateConsistencyTokenRe return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -440,7 +453,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -460,6 +473,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -533,8 +548,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -554,8 +569,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -580,8 +595,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java index df2c9b5536..dbb493b884 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int CONSISTENCY_TOKEN_FIELD_NUMBER = 1; - private volatile java.lang.Object consistencyToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object consistencyToken_ = ""; /** * * @@ -317,8 +319,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; consistencyToken_ = ""; - return this; } @@ -347,11 +349,21 @@ public com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse build() { public com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse buildPartial() { com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse result = new com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse(this); - result.consistencyToken_ = consistencyToken_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.consistencyToken_ = consistencyToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -401,6 +413,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GenerateConsistencyTokenRe return this; if (!other.getConsistencyToken().isEmpty()) { consistencyToken_ = other.consistencyToken_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -432,7 +445,7 @@ public Builder mergeFrom( case 10: { consistencyToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -452,6 +465,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object consistencyToken_ = ""; /** * @@ -513,8 +528,8 @@ public Builder setConsistencyToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - consistencyToken_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -530,8 +545,8 @@ public Builder setConsistencyToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearConsistencyToken() { - consistencyToken_ = getDefaultInstance().getConsistencyToken(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -552,8 +567,8 @@ public Builder setConsistencyTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - consistencyToken_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java index 82a6c7fcb5..31d5bdfcfc 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -348,11 +350,20 @@ public com.google.bigtable.admin.v2.GetAppProfileRequest build() { public com.google.bigtable.admin.v2.GetAppProfileRequest buildPartial() { com.google.bigtable.admin.v2.GetAppProfileRequest result = new com.google.bigtable.admin.v2.GetAppProfileRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.GetAppProfileRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -401,6 +412,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GetAppProfileRequest other return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -432,7 +444,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -452,6 +464,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -522,8 +536,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -542,8 +556,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -567,8 +581,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetBackupRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetBackupRequest.java index 54165afb87..0e60b13a2d 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetBackupRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetBackupRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -321,8 +323,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -350,11 +352,20 @@ public com.google.bigtable.admin.v2.GetBackupRequest build() { public com.google.bigtable.admin.v2.GetBackupRequest buildPartial() { com.google.bigtable.admin.v2.GetBackupRequest result = new com.google.bigtable.admin.v2.GetBackupRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.GetBackupRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -402,6 +413,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GetBackupRequest other) { if (other == com.google.bigtable.admin.v2.GetBackupRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -433,7 +445,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -453,6 +465,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -526,8 +540,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -547,8 +561,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -573,8 +587,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java index 6b80a8e4f9..62348431bb 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -348,11 +350,20 @@ public com.google.bigtable.admin.v2.GetClusterRequest build() { public com.google.bigtable.admin.v2.GetClusterRequest buildPartial() { com.google.bigtable.admin.v2.GetClusterRequest result = new com.google.bigtable.admin.v2.GetClusterRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.GetClusterRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -400,6 +411,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GetClusterRequest other) { if (other == com.google.bigtable.admin.v2.GetClusterRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -431,7 +443,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -451,6 +463,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -521,8 +535,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -541,8 +555,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -566,8 +580,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java index 61a4318c22..184f78876d 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -348,11 +350,20 @@ public com.google.bigtable.admin.v2.GetInstanceRequest build() { public com.google.bigtable.admin.v2.GetInstanceRequest buildPartial() { com.google.bigtable.admin.v2.GetInstanceRequest result = new com.google.bigtable.admin.v2.GetInstanceRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.GetInstanceRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -401,6 +412,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GetInstanceRequest other) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -432,7 +444,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -452,6 +464,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -522,8 +536,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -542,8 +556,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -567,8 +581,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java index 831faeac60..f63b19536f 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java @@ -73,7 +73,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -331,8 +333,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -360,11 +362,20 @@ public com.google.bigtable.admin.v2.GetSnapshotRequest build() { public com.google.bigtable.admin.v2.GetSnapshotRequest buildPartial() { com.google.bigtable.admin.v2.GetSnapshotRequest result = new com.google.bigtable.admin.v2.GetSnapshotRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.GetSnapshotRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -413,6 +424,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GetSnapshotRequest other) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -444,7 +456,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -464,6 +476,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -537,8 +551,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -558,8 +572,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -584,8 +598,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java index 3c2bdabb55..0595579874 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -127,7 +129,7 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int VIEW_FIELD_NUMBER = 2; - private int view_; + private int view_ = 0; /** * * @@ -158,9 +160,8 @@ public int getViewValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.Table.View getView() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Table.View result = - com.google.bigtable.admin.v2.Table.View.valueOf(view_); + com.google.bigtable.admin.v2.Table.View.forNumber(view_); return result == null ? com.google.bigtable.admin.v2.Table.View.UNRECOGNIZED : result; } @@ -371,10 +372,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - view_ = 0; - return this; } @@ -402,12 +402,23 @@ public com.google.bigtable.admin.v2.GetTableRequest build() { public com.google.bigtable.admin.v2.GetTableRequest buildPartial() { com.google.bigtable.admin.v2.GetTableRequest result = new com.google.bigtable.admin.v2.GetTableRequest(this); - result.name_ = name_; - result.view_ = view_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.GetTableRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.view_ = view_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -455,6 +466,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GetTableRequest other) { if (other == com.google.bigtable.admin.v2.GetTableRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.view_ != 0) { @@ -489,13 +501,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { view_ = input.readEnum(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -515,6 +527,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -588,8 +602,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -609,8 +623,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -635,8 +649,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -672,8 +686,8 @@ public int getViewValue() { * @return This builder for chaining. */ public Builder setViewValue(int value) { - view_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -691,9 +705,8 @@ public Builder setViewValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.Table.View getView() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Table.View result = - com.google.bigtable.admin.v2.Table.View.valueOf(view_); + com.google.bigtable.admin.v2.Table.View.forNumber(view_); return result == null ? com.google.bigtable.admin.v2.Table.View.UNRECOGNIZED : result; } /** @@ -713,7 +726,7 @@ public Builder setView(com.google.bigtable.admin.v2.Table.View value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000002; view_ = value.getNumber(); onChanged(); return this; @@ -731,7 +744,7 @@ public Builder setView(com.google.bigtable.admin.v2.Table.View value) { * @return This builder for chaining. */ public Builder clearView() { - + bitField0_ = (bitField0_ & ~0x00000002); view_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/HotTablet.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/HotTablet.java index c8c8349c61..de2118edbf 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/HotTablet.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/HotTablet.java @@ -75,7 +75,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int TABLE_NAME_FIELD_NUMBER = 2; - private volatile java.lang.Object tableName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object tableName_ = ""; /** * * @@ -222,7 +226,7 @@ public com.google.protobuf.Timestamp getStartTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { - return getStartTime(); + return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_; } public static final int END_TIME_FIELD_NUMBER = 4; @@ -271,11 +275,13 @@ public com.google.protobuf.Timestamp getEndTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { - return getEndTime(); + return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } public static final int START_KEY_FIELD_NUMBER = 5; - private volatile java.lang.Object startKey_; + + @SuppressWarnings("serial") + private volatile java.lang.Object startKey_ = ""; /** * * @@ -324,7 +330,9 @@ public com.google.protobuf.ByteString getStartKeyBytes() { } public static final int END_KEY_FIELD_NUMBER = 6; - private volatile java.lang.Object endKey_; + + @SuppressWarnings("serial") + private volatile java.lang.Object endKey_ = ""; /** * * @@ -373,7 +381,7 @@ public com.google.protobuf.ByteString getEndKeyBytes() { } public static final int NODE_CPU_USAGE_PERCENT_FIELD_NUMBER = 7; - private float nodeCpuUsagePercent_; + private float nodeCpuUsagePercent_ = 0F; /** * * @@ -658,28 +666,22 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - tableName_ = ""; - - if (startTimeBuilder_ == null) { - startTime_ = null; - } else { - startTime_ = null; + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - if (endTimeBuilder_ == null) { - endTime_ = null; - } else { - endTime_ = null; + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } startKey_ = ""; - endKey_ = ""; - nodeCpuUsagePercent_ = 0F; - return this; } @@ -707,25 +709,38 @@ public com.google.bigtable.admin.v2.HotTablet build() { public com.google.bigtable.admin.v2.HotTablet buildPartial() { com.google.bigtable.admin.v2.HotTablet result = new com.google.bigtable.admin.v2.HotTablet(this); - result.name_ = name_; - result.tableName_ = tableName_; - if (startTimeBuilder_ == null) { - result.startTime_ = startTime_; - } else { - result.startTime_ = startTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - if (endTimeBuilder_ == null) { - result.endTime_ = endTime_; - } else { - result.endTime_ = endTimeBuilder_.build(); - } - result.startKey_ = startKey_; - result.endKey_ = endKey_; - result.nodeCpuUsagePercent_ = nodeCpuUsagePercent_; onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.HotTablet result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.tableName_ = tableName_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.startKey_ = startKey_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.endKey_ = endKey_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.nodeCpuUsagePercent_ = nodeCpuUsagePercent_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -773,10 +788,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.HotTablet other) { if (other == com.google.bigtable.admin.v2.HotTablet.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getTableName().isEmpty()) { tableName_ = other.tableName_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasStartTime()) { @@ -787,10 +804,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.HotTablet other) { } if (!other.getStartKey().isEmpty()) { startKey_ = other.startKey_; + bitField0_ |= 0x00000010; onChanged(); } if (!other.getEndKey().isEmpty()) { endKey_ = other.endKey_; + bitField0_ |= 0x00000020; onChanged(); } if (other.getNodeCpuUsagePercent() != 0F) { @@ -825,43 +844,43 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { tableName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 34 case 42: { startKey_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000010; break; } // case 42 case 50: { endKey_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000020; break; } // case 50 case 61: { nodeCpuUsagePercent_ = input.readFloat(); - + bitField0_ |= 0x00000040; break; } // case 61 default: @@ -881,6 +900,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -945,8 +966,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -963,8 +984,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -986,8 +1007,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1056,8 +1077,8 @@ public Builder setTableName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - tableName_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1074,8 +1095,8 @@ public Builder setTableName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTableName() { - tableName_ = getDefaultInstance().getTableName(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1097,8 +1118,8 @@ public Builder setTableNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - tableName_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1122,7 +1143,7 @@ public Builder setTableNameBytes(com.google.protobuf.ByteString value) { * @return Whether the startTime field is set. */ public boolean hasStartTime() { - return startTimeBuilder_ != null || startTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1159,11 +1180,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } startTime_ = value; - onChanged(); } else { startTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1179,11 +1200,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (startTimeBuilder_ == null) { startTime_ = builderForValue.build(); - onChanged(); } else { startTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1198,17 +1219,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu */ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { if (startTimeBuilder_ == null) { - if (startTime_ != null) { - startTime_ = - com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && startTime_ != null + && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getStartTimeBuilder().mergeFrom(value); } else { startTime_ = value; } - onChanged(); } else { startTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1222,14 +1244,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { * */ public Builder clearStartTime() { - if (startTimeBuilder_ == null) { - startTime_ = null; - onChanged(); - } else { - startTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1243,7 +1264,7 @@ public Builder clearStartTime() { * */ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getStartTimeFieldBuilder().getBuilder(); } @@ -1310,7 +1331,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { * @return Whether the endTime field is set. */ public boolean hasEndTime() { - return endTimeBuilder_ != null || endTime_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1347,11 +1368,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } endTime_ = value; - onChanged(); } else { endTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1367,11 +1388,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (endTimeBuilder_ == null) { endTime_ = builderForValue.build(); - onChanged(); } else { endTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1386,17 +1407,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) */ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { if (endTimeBuilder_ == null) { - if (endTime_ != null) { - endTime_ = - com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && endTime_ != null + && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getEndTimeBuilder().mergeFrom(value); } else { endTime_ = value; } - onChanged(); } else { endTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1410,14 +1432,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { * */ public Builder clearEndTime() { - if (endTimeBuilder_ == null) { - endTime_ = null; - onChanged(); - } else { - endTime_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1431,7 +1452,7 @@ public Builder clearEndTime() { * */ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getEndTimeFieldBuilder().getBuilder(); } @@ -1540,8 +1561,8 @@ public Builder setStartKey(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - startKey_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1557,8 +1578,8 @@ public Builder setStartKey(java.lang.String value) { * @return This builder for chaining. */ public Builder clearStartKey() { - startKey_ = getDefaultInstance().getStartKey(); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -1579,8 +1600,8 @@ public Builder setStartKeyBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - startKey_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1646,8 +1667,8 @@ public Builder setEndKey(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - endKey_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -1663,8 +1684,8 @@ public Builder setEndKey(java.lang.String value) { * @return This builder for chaining. */ public Builder clearEndKey() { - endKey_ = getDefaultInstance().getEndKey(); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); return this; } @@ -1685,8 +1706,8 @@ public Builder setEndKeyBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - endKey_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -1728,6 +1749,7 @@ public float getNodeCpuUsagePercent() { public Builder setNodeCpuUsagePercent(float value) { nodeCpuUsagePercent_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -1746,7 +1768,7 @@ public Builder setNodeCpuUsagePercent(float value) { * @return This builder for chaining. */ public Builder clearNodeCpuUsagePercent() { - + bitField0_ = (bitField0_ & ~0x00000040); nodeCpuUsagePercent_ = 0F; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java index 67b76dd0c7..464d92ceb8 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java @@ -412,7 +412,9 @@ private Type(int value) { private int bitField0_; public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -463,7 +465,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int DISPLAY_NAME_FIELD_NUMBER = 2; - private volatile java.lang.Object displayName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object displayName_ = ""; /** * * @@ -516,7 +520,7 @@ public com.google.protobuf.ByteString getDisplayNameBytes() { } public static final int STATE_FIELD_NUMBER = 3; - private int state_; + private int state_ = 0; /** * * @@ -547,14 +551,13 @@ public int getStateValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.Instance.State getState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Instance.State result = - com.google.bigtable.admin.v2.Instance.State.valueOf(state_); + com.google.bigtable.admin.v2.Instance.State.forNumber(state_); return result == null ? com.google.bigtable.admin.v2.Instance.State.UNRECOGNIZED : result; } public static final int TYPE_FIELD_NUMBER = 4; - private int type_; + private int type_ = 0; /** * * @@ -583,9 +586,8 @@ public int getTypeValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.Instance.Type getType() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Instance.Type result = - com.google.bigtable.admin.v2.Instance.Type.valueOf(type_); + com.google.bigtable.admin.v2.Instance.Type.forNumber(type_); return result == null ? com.google.bigtable.admin.v2.Instance.Type.UNRECOGNIZED : result; } @@ -602,6 +604,7 @@ private static final class LabelsDefaultEntryHolder { ""); } + @SuppressWarnings("serial") private com.google.protobuf.MapField labels_; private com.google.protobuf.MapField internalGetLabels() { @@ -686,7 +689,10 @@ public java.util.Map getLabelsMap() { * map<string, string> labels = 5; */ @java.lang.Override - public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -775,11 +781,11 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } public static final int SATISFIES_PZS_FIELD_NUMBER = 8; - private boolean satisfiesPzs_; + private boolean satisfiesPzs_ = false; /** * * @@ -1101,23 +1107,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - displayName_ = ""; - state_ = 0; - type_ = 0; - internalGetMutableLabels().clear(); - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } satisfiesPzs_ = false; - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -1145,26 +1146,40 @@ public com.google.bigtable.admin.v2.Instance build() { public com.google.bigtable.admin.v2.Instance buildPartial() { com.google.bigtable.admin.v2.Instance result = new com.google.bigtable.admin.v2.Instance(this); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.Instance result) { int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - result.name_ = name_; - result.displayName_ = displayName_; - result.state_ = state_; - result.type_ = type_; - result.labels_ = internalGetLabels(); - result.labels_.makeImmutable(); - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; } if (((from_bitField0_ & 0x00000002) != 0)) { + result.displayName_ = displayName_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.state_ = state_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.type_ = type_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.labels_ = internalGetLabels(); + result.labels_.makeImmutable(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000040) != 0)) { result.satisfiesPzs_ = satisfiesPzs_; to_bitField0_ |= 0x00000001; } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -1214,10 +1229,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Instance other) { if (other == com.google.bigtable.admin.v2.Instance.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getDisplayName().isEmpty()) { displayName_ = other.displayName_; + bitField0_ |= 0x00000002; onChanged(); } if (other.state_ != 0) { @@ -1227,6 +1244,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Instance other) { setTypeValue(other.getTypeValue()); } internalGetMutableLabels().mergeFrom(other.internalGetLabels()); + bitField0_ |= 0x00000010; if (other.hasCreateTime()) { mergeCreateTime(other.getCreateTime()); } @@ -1262,25 +1280,25 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { displayName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { state_ = input.readEnum(); - + bitField0_ |= 0x00000004; break; } // case 24 case 32: { type_ = input.readEnum(); - + bitField0_ |= 0x00000008; break; } // case 32 case 42: @@ -1292,18 +1310,19 @@ public Builder mergeFrom( internalGetMutableLabels() .getMutableMap() .put(labels__.getKey(), labels__.getValue()); + bitField0_ |= 0x00000010; break; } // case 42 case 58: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000020; break; } // case 58 case 64: { satisfiesPzs_ = input.readBool(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000040; break; } // case 64 default: @@ -1389,8 +1408,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1407,8 +1426,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1430,8 +1449,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1503,8 +1522,8 @@ public Builder setDisplayName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - displayName_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1522,8 +1541,8 @@ public Builder setDisplayName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDisplayName() { - displayName_ = getDefaultInstance().getDisplayName(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1546,8 +1565,8 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - displayName_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1583,8 +1602,8 @@ public int getStateValue() { * @return This builder for chaining. */ public Builder setStateValue(int value) { - state_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1602,9 +1621,8 @@ public Builder setStateValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.Instance.State getState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Instance.State result = - com.google.bigtable.admin.v2.Instance.State.valueOf(state_); + com.google.bigtable.admin.v2.Instance.State.forNumber(state_); return result == null ? com.google.bigtable.admin.v2.Instance.State.UNRECOGNIZED : result; } /** @@ -1624,7 +1642,7 @@ public Builder setState(com.google.bigtable.admin.v2.Instance.State value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000004; state_ = value.getNumber(); onChanged(); return this; @@ -1642,7 +1660,7 @@ public Builder setState(com.google.bigtable.admin.v2.Instance.State value) { * @return This builder for chaining. */ public Builder clearState() { - + bitField0_ = (bitField0_ & ~0x00000004); state_ = 0; onChanged(); return this; @@ -1677,8 +1695,8 @@ public int getTypeValue() { * @return This builder for chaining. */ public Builder setTypeValue(int value) { - type_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1695,9 +1713,8 @@ public Builder setTypeValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.Instance.Type getType() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Instance.Type result = - com.google.bigtable.admin.v2.Instance.Type.valueOf(type_); + com.google.bigtable.admin.v2.Instance.Type.forNumber(type_); return result == null ? com.google.bigtable.admin.v2.Instance.Type.UNRECOGNIZED : result; } /** @@ -1716,7 +1733,7 @@ public Builder setType(com.google.bigtable.admin.v2.Instance.Type value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000008; type_ = value.getNumber(); onChanged(); return this; @@ -1733,7 +1750,7 @@ public Builder setType(com.google.bigtable.admin.v2.Instance.Type value) { * @return This builder for chaining. */ public Builder clearType() { - + bitField0_ = (bitField0_ & ~0x00000008); type_ = 0; onChanged(); return this; @@ -1750,14 +1767,14 @@ private com.google.protobuf.MapField interna private com.google.protobuf.MapField internalGetMutableLabels() { - onChanged(); - ; if (labels_ == null) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); } if (!labels_.isMutable()) { labels_ = labels_.copy(); } + bitField0_ |= 0x00000010; + onChanged(); return labels_; } @@ -1836,8 +1853,10 @@ public java.util.Map getLabelsMap() { * map<string, string> labels = 5; */ @java.lang.Override - public java.lang.String getLabelsOrDefault( - java.lang.String key, java.lang.String defaultValue) { + public /* nullable */ java.lang.String getLabelsOrDefault( + java.lang.String key, + /* nullable */ + java.lang.String defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -1875,6 +1894,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { } public Builder clearLabels() { + bitField0_ = (bitField0_ & ~0x00000010); internalGetMutableLabels().getMutableMap().clear(); return this; } @@ -1906,6 +1926,7 @@ public Builder removeLabels(java.lang.String key) { /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableLabels() { + bitField0_ |= 0x00000010; return internalGetMutableLabels().getMutableMap(); } /** @@ -1933,8 +1954,8 @@ public Builder putLabels(java.lang.String key, java.lang.String value) { if (value == null) { throw new NullPointerException("map value"); } - internalGetMutableLabels().getMutableMap().put(key, value); + bitField0_ |= 0x00000010; return this; } /** @@ -1957,6 +1978,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) { */ public Builder putAllLabels(java.util.Map values) { internalGetMutableLabels().getMutableMap().putAll(values); + bitField0_ |= 0x00000010; return this; } @@ -1982,7 +2004,7 @@ public Builder putAllLabels(java.util.Map va * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000020) != 0); } /** * @@ -2027,11 +2049,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -2050,11 +2072,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -2072,17 +2094,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000020) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -2099,14 +2122,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000020); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -2123,7 +2145,7 @@ public Builder clearCreateTime() { * */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000020; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } @@ -2193,7 +2215,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { */ @java.lang.Override public boolean hasSatisfiesPzs() { - return ((bitField0_ & 0x00000002) != 0); + return ((bitField0_ & 0x00000040) != 0); } /** * @@ -2223,8 +2245,9 @@ public boolean getSatisfiesPzs() { * @return This builder for chaining. */ public Builder setSatisfiesPzs(boolean value) { - bitField0_ |= 0x00000002; + satisfiesPzs_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -2240,7 +2263,7 @@ public Builder setSatisfiesPzs(boolean value) { * @return This builder for chaining. */ public Builder clearSatisfiesPzs() { - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000040); satisfiesPzs_ = false; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceOrBuilder.java index 103b7d8457..e79a809dbe 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceOrBuilder.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceOrBuilder.java @@ -209,7 +209,6 @@ public interface InstanceOrBuilder * * map<string, string> labels = 5; */ - /* nullable */ java.lang.String getLabelsOrDefault( java.lang.String key, diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java index 492fa44099..1229c6809e 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -130,7 +132,7 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 3; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -154,7 +156,9 @@ public int getPageSize() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -417,12 +421,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageSize_ = 0; - pageToken_ = ""; - return this; } @@ -450,13 +452,26 @@ public com.google.bigtable.admin.v2.ListAppProfilesRequest build() { public com.google.bigtable.admin.v2.ListAppProfilesRequest buildPartial() { com.google.bigtable.admin.v2.ListAppProfilesRequest result = new com.google.bigtable.admin.v2.ListAppProfilesRequest(this); - result.parent_ = parent_; - result.pageSize_ = pageSize_; - result.pageToken_ = pageToken_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.ListAppProfilesRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageSize_ = pageSize_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.pageToken_ = pageToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -505,6 +520,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListAppProfilesRequest oth return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getPageSize() != 0) { @@ -512,6 +528,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListAppProfilesRequest oth } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -543,19 +560,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 18 case 24: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000002; break; } // case 24 default: @@ -575,6 +592,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -654,8 +673,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -677,8 +696,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -705,8 +724,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -754,6 +773,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -775,7 +795,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000002); pageSize_ = 0; onChanged(); return this; @@ -842,8 +862,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -859,8 +879,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -881,8 +901,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java index 42ce1fdf18..89e5c8a1e1 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java @@ -70,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int APP_PROFILES_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List appProfiles_; /** * @@ -139,7 +141,9 @@ public com.google.bigtable.admin.v2.AppProfileOrBuilder getAppProfilesOrBuilder( } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -192,6 +196,8 @@ public com.google.protobuf.ByteString getNextPageTokenBytes() { } public static final int FAILED_LOCATIONS_FIELD_NUMBER = 3; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList failedLocations_; /** * @@ -488,6 +494,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (appProfilesBuilder_ == null) { appProfiles_ = java.util.Collections.emptyList(); } else { @@ -496,9 +503,8 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - failedLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -526,7 +532,16 @@ public com.google.bigtable.admin.v2.ListAppProfilesResponse build() { public com.google.bigtable.admin.v2.ListAppProfilesResponse buildPartial() { com.google.bigtable.admin.v2.ListAppProfilesResponse result = new com.google.bigtable.admin.v2.ListAppProfilesResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.ListAppProfilesResponse result) { if (appProfilesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { appProfiles_ = java.util.Collections.unmodifiableList(appProfiles_); @@ -536,14 +551,18 @@ public com.google.bigtable.admin.v2.ListAppProfilesResponse buildPartial() { } else { result.appProfiles_ = appProfilesBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000004) != 0)) { failedLocations_ = failedLocations_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); } result.failedLocations_ = failedLocations_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.ListAppProfilesResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -621,12 +640,13 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListAppProfilesResponse ot } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.failedLocations_.isEmpty()) { if (failedLocations_.isEmpty()) { failedLocations_ = other.failedLocations_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); } else { ensureFailedLocationsIsMutable(); failedLocations_.addAll(other.failedLocations_); @@ -675,7 +695,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: @@ -1121,8 +1141,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1140,8 +1160,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1164,8 +1184,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1174,9 +1194,9 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureFailedLocationsIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000004) != 0)) { failedLocations_ = new com.google.protobuf.LazyStringArrayList(failedLocations_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; } } /** @@ -1335,7 +1355,7 @@ public Builder addAllFailedLocations(java.lang.Iterable values */ public Builder clearFailedLocations() { failedLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequest.java index f36e324d1c..60c02cc029 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequest.java @@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -130,7 +132,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int FILTER_FIELD_NUMBER = 2; - private volatile java.lang.Object filter_; + + @SuppressWarnings("serial") + private volatile java.lang.Object filter_ = ""; /** * * @@ -233,7 +237,9 @@ public com.google.protobuf.ByteString getFilterBytes() { } public static final int ORDER_BY_FIELD_NUMBER = 3; - private volatile java.lang.Object orderBy_; + + @SuppressWarnings("serial") + private volatile java.lang.Object orderBy_ = ""; /** * * @@ -314,7 +320,7 @@ public com.google.protobuf.ByteString getOrderByBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 4; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -333,7 +339,9 @@ public int getPageSize() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 5; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -620,16 +628,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - filter_ = ""; - orderBy_ = ""; - pageSize_ = 0; - pageToken_ = ""; - return this; } @@ -657,15 +661,32 @@ public com.google.bigtable.admin.v2.ListBackupsRequest build() { public com.google.bigtable.admin.v2.ListBackupsRequest buildPartial() { com.google.bigtable.admin.v2.ListBackupsRequest result = new com.google.bigtable.admin.v2.ListBackupsRequest(this); - result.parent_ = parent_; - result.filter_ = filter_; - result.orderBy_ = orderBy_; - result.pageSize_ = pageSize_; - result.pageToken_ = pageToken_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.ListBackupsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.filter_ = filter_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.orderBy_ = orderBy_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.pageSize_ = pageSize_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.pageToken_ = pageToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -714,14 +735,17 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListBackupsRequest other) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getFilter().isEmpty()) { filter_ = other.filter_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getOrderBy().isEmpty()) { orderBy_ = other.orderBy_; + bitField0_ |= 0x00000004; onChanged(); } if (other.getPageSize() != 0) { @@ -729,6 +753,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListBackupsRequest other) } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000010; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -760,31 +785,31 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { filter_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { orderBy_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 32: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000008; break; } // case 32 case 42: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000010; break; } // case 42 default: @@ -804,6 +829,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -880,8 +907,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -902,8 +929,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -929,8 +956,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1077,8 +1104,8 @@ public Builder setFilter(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - filter_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1121,8 +1148,8 @@ public Builder setFilter(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFilter() { - filter_ = getDefaultInstance().getFilter(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1170,8 +1197,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - filter_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1285,8 +1312,8 @@ public Builder setOrderBy(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - orderBy_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1318,8 +1345,8 @@ public Builder setOrderBy(java.lang.String value) { * @return This builder for chaining. */ public Builder clearOrderBy() { - orderBy_ = getDefaultInstance().getOrderBy(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1356,8 +1383,8 @@ public Builder setOrderByBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - orderBy_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1395,6 +1422,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1411,7 +1439,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000008); pageSize_ = 0; onChanged(); return this; @@ -1487,8 +1515,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1507,8 +1535,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -1532,8 +1560,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponse.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponse.java index 0e026a369c..73138f350b 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponse.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponse.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int BACKUPS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List backups_; /** * @@ -138,7 +140,9 @@ public com.google.bigtable.admin.v2.BackupOrBuilder getBackupsOrBuilder(int inde } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -398,6 +402,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (backupsBuilder_ == null) { backups_ = java.util.Collections.emptyList(); } else { @@ -406,7 +411,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -434,7 +438,16 @@ public com.google.bigtable.admin.v2.ListBackupsResponse build() { public com.google.bigtable.admin.v2.ListBackupsResponse buildPartial() { com.google.bigtable.admin.v2.ListBackupsResponse result = new com.google.bigtable.admin.v2.ListBackupsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.ListBackupsResponse result) { if (backupsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { backups_ = java.util.Collections.unmodifiableList(backups_); @@ -444,9 +457,13 @@ public com.google.bigtable.admin.v2.ListBackupsResponse buildPartial() { } else { result.backups_ = backupsBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.ListBackupsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -524,6 +541,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListBackupsResponse other) } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -568,7 +586,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -1005,8 +1023,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1024,8 +1042,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1048,8 +1066,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java index f131727426..efc0aa4d62 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -128,7 +130,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -382,10 +386,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageToken_ = ""; - return this; } @@ -413,12 +416,23 @@ public com.google.bigtable.admin.v2.ListClustersRequest build() { public com.google.bigtable.admin.v2.ListClustersRequest buildPartial() { com.google.bigtable.admin.v2.ListClustersRequest result = new com.google.bigtable.admin.v2.ListClustersRequest(this); - result.parent_ = parent_; - result.pageToken_ = pageToken_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.ListClustersRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageToken_ = pageToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -467,10 +481,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListClustersRequest other) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -502,13 +518,13 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -528,6 +544,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -604,8 +622,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -626,8 +644,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -653,8 +671,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -720,8 +738,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -737,8 +755,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -759,8 +777,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java index 4bb6580ce2..9eb77a02d6 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java @@ -70,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int CLUSTERS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List clusters_; /** * @@ -139,6 +141,8 @@ public com.google.bigtable.admin.v2.ClusterOrBuilder getClustersOrBuilder(int in } public static final int FAILED_LOCATIONS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList failedLocations_; /** * @@ -216,7 +220,9 @@ public com.google.protobuf.ByteString getFailedLocationsBytes(int index) { } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 3; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -488,6 +494,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (clustersBuilder_ == null) { clusters_ = java.util.Collections.emptyList(); } else { @@ -498,7 +505,6 @@ public Builder clear() { failedLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); nextPageToken_ = ""; - return this; } @@ -526,7 +532,16 @@ public com.google.bigtable.admin.v2.ListClustersResponse build() { public com.google.bigtable.admin.v2.ListClustersResponse buildPartial() { com.google.bigtable.admin.v2.ListClustersResponse result = new com.google.bigtable.admin.v2.ListClustersResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.ListClustersResponse result) { if (clustersBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { clusters_ = java.util.Collections.unmodifiableList(clusters_); @@ -541,9 +556,13 @@ public com.google.bigtable.admin.v2.ListClustersResponse buildPartial() { bitField0_ = (bitField0_ & ~0x00000002); } result.failedLocations_ = failedLocations_; - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.ListClustersResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000004) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -631,6 +650,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListClustersResponse other } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -682,7 +702,7 @@ public Builder mergeFrom( case 26: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -1317,8 +1337,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1334,8 +1354,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1356,8 +1376,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListHotTabletsRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListHotTabletsRequest.java index 103fa0b8c7..3789db934e 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListHotTabletsRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListHotTabletsRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -183,7 +185,7 @@ public com.google.protobuf.Timestamp getStartTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { - return getStartTime(); + return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_; } public static final int END_TIME_FIELD_NUMBER = 3; @@ -229,11 +231,11 @@ public com.google.protobuf.Timestamp getEndTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { - return getEndTime(); + return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } public static final int PAGE_SIZE_FIELD_NUMBER = 4; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -257,7 +259,9 @@ public int getPageSize() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 5; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -548,24 +552,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - - if (startTimeBuilder_ == null) { - startTime_ = null; - } else { - startTime_ = null; + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - if (endTimeBuilder_ == null) { - endTime_ = null; - } else { - endTime_ = null; + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } pageSize_ = 0; - pageToken_ = ""; - return this; } @@ -593,23 +593,32 @@ public com.google.bigtable.admin.v2.ListHotTabletsRequest build() { public com.google.bigtable.admin.v2.ListHotTabletsRequest buildPartial() { com.google.bigtable.admin.v2.ListHotTabletsRequest result = new com.google.bigtable.admin.v2.ListHotTabletsRequest(this); - result.parent_ = parent_; - if (startTimeBuilder_ == null) { - result.startTime_ = startTime_; - } else { - result.startTime_ = startTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - if (endTimeBuilder_ == null) { - result.endTime_ = endTime_; - } else { - result.endTime_ = endTimeBuilder_.build(); - } - result.pageSize_ = pageSize_; - result.pageToken_ = pageToken_; onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.ListHotTabletsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.pageSize_ = pageSize_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.pageToken_ = pageToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -658,6 +667,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListHotTabletsRequest othe return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasStartTime()) { @@ -671,6 +681,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListHotTabletsRequest othe } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000010; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -702,31 +713,31 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 32: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000008; break; } // case 32 case 42: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000010; break; } // case 42 default: @@ -746,6 +757,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -819,8 +832,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -840,8 +853,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -866,8 +879,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -895,7 +908,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * @return Whether the startTime field is set. */ public boolean hasStartTime() { - return startTimeBuilder_ != null || startTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -940,11 +953,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } startTime_ = value; - onChanged(); } else { startTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -964,11 +977,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (startTimeBuilder_ == null) { startTime_ = builderForValue.build(); - onChanged(); } else { startTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -987,17 +1000,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu */ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { if (startTimeBuilder_ == null) { - if (startTime_ != null) { - startTime_ = - com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && startTime_ != null + && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getStartTimeBuilder().mergeFrom(value); } else { startTime_ = value; } - onChanged(); } else { startTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1015,14 +1029,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp start_time = 2; */ public Builder clearStartTime() { - if (startTimeBuilder_ == null) { - startTime_ = null; - onChanged(); - } else { - startTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1040,7 +1053,7 @@ public Builder clearStartTime() { * .google.protobuf.Timestamp start_time = 2; */ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getStartTimeFieldBuilder().getBuilder(); } @@ -1114,7 +1127,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { * @return Whether the endTime field is set. */ public boolean hasEndTime() { - return endTimeBuilder_ != null || endTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1149,11 +1162,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } endTime_ = value; - onChanged(); } else { endTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1168,11 +1181,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (endTimeBuilder_ == null) { endTime_ = builderForValue.build(); - onChanged(); } else { endTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1186,17 +1199,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) */ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { if (endTimeBuilder_ == null) { - if (endTime_ != null) { - endTime_ = - com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && endTime_ != null + && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getEndTimeBuilder().mergeFrom(value); } else { endTime_ = value; } - onChanged(); } else { endTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1209,14 +1223,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp end_time = 3; */ public Builder clearEndTime() { - if (endTimeBuilder_ == null) { - endTime_ = null; - onChanged(); - } else { - endTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1229,7 +1242,7 @@ public Builder clearEndTime() { * .google.protobuf.Timestamp end_time = 3; */ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getEndTimeFieldBuilder().getBuilder(); } @@ -1318,6 +1331,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1339,7 +1353,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000008); pageSize_ = 0; onChanged(); return this; @@ -1406,8 +1420,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1423,8 +1437,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -1445,8 +1459,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListHotTabletsResponse.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListHotTabletsResponse.java index 90ecf3ef7d..e697e35972 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListHotTabletsResponse.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListHotTabletsResponse.java @@ -69,6 +69,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int HOT_TABLETS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List hotTablets_; /** * @@ -158,7 +160,9 @@ public com.google.bigtable.admin.v2.HotTabletOrBuilder getHotTabletsOrBuilder(in } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -418,6 +422,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (hotTabletsBuilder_ == null) { hotTablets_ = java.util.Collections.emptyList(); } else { @@ -426,7 +431,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -454,7 +458,16 @@ public com.google.bigtable.admin.v2.ListHotTabletsResponse build() { public com.google.bigtable.admin.v2.ListHotTabletsResponse buildPartial() { com.google.bigtable.admin.v2.ListHotTabletsResponse result = new com.google.bigtable.admin.v2.ListHotTabletsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.ListHotTabletsResponse result) { if (hotTabletsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { hotTablets_ = java.util.Collections.unmodifiableList(hotTablets_); @@ -464,9 +477,13 @@ public com.google.bigtable.admin.v2.ListHotTabletsResponse buildPartial() { } else { result.hotTablets_ = hotTabletsBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.ListHotTabletsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -544,6 +561,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListHotTabletsResponse oth } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -588,7 +606,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -1098,8 +1116,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1117,8 +1135,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1141,8 +1159,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java index a64bd54432..0400cd697a 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -124,7 +126,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -378,10 +382,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageToken_ = ""; - return this; } @@ -409,12 +412,23 @@ public com.google.bigtable.admin.v2.ListInstancesRequest build() { public com.google.bigtable.admin.v2.ListInstancesRequest buildPartial() { com.google.bigtable.admin.v2.ListInstancesRequest result = new com.google.bigtable.admin.v2.ListInstancesRequest(this); - result.parent_ = parent_; - result.pageToken_ = pageToken_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.ListInstancesRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageToken_ = pageToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -463,10 +477,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListInstancesRequest other return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -498,13 +514,13 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -524,6 +540,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -594,8 +612,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -614,8 +632,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -639,8 +657,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -706,8 +724,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -723,8 +741,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -745,8 +763,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java index d02e624e85..a7e6753c85 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java @@ -70,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int INSTANCES_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List instances_; /** * @@ -139,6 +141,8 @@ public com.google.bigtable.admin.v2.InstanceOrBuilder getInstancesOrBuilder(int } public static final int FAILED_LOCATIONS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList failedLocations_; /** * @@ -220,7 +224,9 @@ public com.google.protobuf.ByteString getFailedLocationsBytes(int index) { } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 3; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -492,6 +498,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (instancesBuilder_ == null) { instances_ = java.util.Collections.emptyList(); } else { @@ -502,7 +509,6 @@ public Builder clear() { failedLocations_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); nextPageToken_ = ""; - return this; } @@ -530,7 +536,16 @@ public com.google.bigtable.admin.v2.ListInstancesResponse build() { public com.google.bigtable.admin.v2.ListInstancesResponse buildPartial() { com.google.bigtable.admin.v2.ListInstancesResponse result = new com.google.bigtable.admin.v2.ListInstancesResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.ListInstancesResponse result) { if (instancesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { instances_ = java.util.Collections.unmodifiableList(instances_); @@ -545,9 +560,13 @@ public com.google.bigtable.admin.v2.ListInstancesResponse buildPartial() { bitField0_ = (bitField0_ & ~0x00000002); } result.failedLocations_ = failedLocations_; - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.ListInstancesResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000004) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -635,6 +654,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListInstancesResponse othe } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -686,7 +706,7 @@ public Builder mergeFrom( case 26: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -1330,8 +1350,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1347,8 +1367,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1369,8 +1389,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java index 3691b0075a..d561f171e8 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java @@ -74,7 +74,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -135,7 +137,7 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int PAGE_SIZE_FIELD_NUMBER = 2; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -154,7 +156,9 @@ public int getPageSize() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 3; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -422,12 +426,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - pageSize_ = 0; - pageToken_ = ""; - return this; } @@ -455,13 +457,26 @@ public com.google.bigtable.admin.v2.ListSnapshotsRequest build() { public com.google.bigtable.admin.v2.ListSnapshotsRequest buildPartial() { com.google.bigtable.admin.v2.ListSnapshotsRequest result = new com.google.bigtable.admin.v2.ListSnapshotsRequest(this); - result.parent_ = parent_; - result.pageSize_ = pageSize_; - result.pageToken_ = pageToken_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.ListSnapshotsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.pageSize_ = pageSize_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.pageToken_ = pageToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -510,6 +525,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListSnapshotsRequest other return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getPageSize() != 0) { @@ -517,6 +533,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListSnapshotsRequest other } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -548,19 +565,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000002; break; } // case 16 case 26: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -580,6 +597,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -659,8 +678,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -682,8 +701,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -710,8 +729,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -749,6 +768,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -765,7 +785,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000002); pageSize_ = 0; onChanged(); return this; @@ -832,8 +852,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -849,8 +869,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -871,8 +891,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java index f28481e039..3b7e4ff6e6 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java @@ -74,6 +74,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SNAPSHOTS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List snapshots_; /** * @@ -143,7 +145,9 @@ public com.google.bigtable.admin.v2.SnapshotOrBuilder getSnapshotsOrBuilder(int } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -408,6 +412,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (snapshotsBuilder_ == null) { snapshots_ = java.util.Collections.emptyList(); } else { @@ -416,7 +421,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -444,7 +448,16 @@ public com.google.bigtable.admin.v2.ListSnapshotsResponse build() { public com.google.bigtable.admin.v2.ListSnapshotsResponse buildPartial() { com.google.bigtable.admin.v2.ListSnapshotsResponse result = new com.google.bigtable.admin.v2.ListSnapshotsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.ListSnapshotsResponse result) { if (snapshotsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { snapshots_ = java.util.Collections.unmodifiableList(snapshots_); @@ -454,9 +467,13 @@ public com.google.bigtable.admin.v2.ListSnapshotsResponse buildPartial() { } else { result.snapshots_ = snapshotsBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.ListSnapshotsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -534,6 +551,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListSnapshotsResponse othe } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -578,7 +596,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -1015,8 +1033,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1034,8 +1052,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1058,8 +1076,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java index b2ff56b8e2..2d4b6e6c0a 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java @@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -126,7 +128,7 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int VIEW_FIELD_NUMBER = 2; - private int view_; + private int view_ = 0; /** * * @@ -157,14 +159,13 @@ public int getViewValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.Table.View getView() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Table.View result = - com.google.bigtable.admin.v2.Table.View.valueOf(view_); + com.google.bigtable.admin.v2.Table.View.forNumber(view_); return result == null ? com.google.bigtable.admin.v2.Table.View.UNRECOGNIZED : result; } public static final int PAGE_SIZE_FIELD_NUMBER = 4; - private int pageSize_; + private int pageSize_ = 0; /** * * @@ -188,7 +189,9 @@ public int getPageSize() { } public static final int PAGE_TOKEN_FIELD_NUMBER = 3; - private volatile java.lang.Object pageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object pageToken_ = ""; /** * * @@ -461,14 +464,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - view_ = 0; - pageSize_ = 0; - pageToken_ = ""; - return this; } @@ -496,14 +496,29 @@ public com.google.bigtable.admin.v2.ListTablesRequest build() { public com.google.bigtable.admin.v2.ListTablesRequest buildPartial() { com.google.bigtable.admin.v2.ListTablesRequest result = new com.google.bigtable.admin.v2.ListTablesRequest(this); - result.parent_ = parent_; - result.view_ = view_; - result.pageSize_ = pageSize_; - result.pageToken_ = pageToken_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.ListTablesRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.view_ = view_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.pageSize_ = pageSize_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.pageToken_ = pageToken_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -551,6 +566,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListTablesRequest other) { if (other == com.google.bigtable.admin.v2.ListTablesRequest.getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.view_ != 0) { @@ -561,6 +577,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListTablesRequest other) { } if (!other.getPageToken().isEmpty()) { pageToken_ = other.pageToken_; + bitField0_ |= 0x00000008; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -592,25 +609,25 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { view_ = input.readEnum(); - + bitField0_ |= 0x00000002; break; } // case 16 case 26: { pageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000008; break; } // case 26 case 32: { pageSize_ = input.readInt32(); - + bitField0_ |= 0x00000004; break; } // case 32 default: @@ -630,6 +647,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -700,8 +719,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -720,8 +739,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -745,8 +764,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -782,8 +801,8 @@ public int getViewValue() { * @return This builder for chaining. */ public Builder setViewValue(int value) { - view_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -801,9 +820,8 @@ public Builder setViewValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.Table.View getView() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Table.View result = - com.google.bigtable.admin.v2.Table.View.valueOf(view_); + com.google.bigtable.admin.v2.Table.View.forNumber(view_); return result == null ? com.google.bigtable.admin.v2.Table.View.UNRECOGNIZED : result; } /** @@ -823,7 +841,7 @@ public Builder setView(com.google.bigtable.admin.v2.Table.View value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000002; view_ = value.getNumber(); onChanged(); return this; @@ -841,7 +859,7 @@ public Builder setView(com.google.bigtable.admin.v2.Table.View value) { * @return This builder for chaining. */ public Builder clearView() { - + bitField0_ = (bitField0_ & ~0x00000002); view_ = 0; onChanged(); return this; @@ -890,6 +908,7 @@ public int getPageSize() { public Builder setPageSize(int value) { pageSize_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -911,7 +930,7 @@ public Builder setPageSize(int value) { * @return This builder for chaining. */ public Builder clearPageSize() { - + bitField0_ = (bitField0_ & ~0x00000004); pageSize_ = 0; onChanged(); return this; @@ -978,8 +997,8 @@ public Builder setPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - pageToken_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -995,8 +1014,8 @@ public Builder setPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearPageToken() { - pageToken_ = getDefaultInstance().getPageToken(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -1017,8 +1036,8 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - pageToken_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java index fecfb3c893..a5cd84eecf 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java @@ -70,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int TABLES_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List tables_; /** * @@ -139,7 +141,9 @@ public com.google.bigtable.admin.v2.TableOrBuilder getTablesOrBuilder(int index) } public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 2; - private volatile java.lang.Object nextPageToken_; + + @SuppressWarnings("serial") + private volatile java.lang.Object nextPageToken_ = ""; /** * * @@ -400,6 +404,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (tablesBuilder_ == null) { tables_ = java.util.Collections.emptyList(); } else { @@ -408,7 +413,6 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); nextPageToken_ = ""; - return this; } @@ -436,7 +440,16 @@ public com.google.bigtable.admin.v2.ListTablesResponse build() { public com.google.bigtable.admin.v2.ListTablesResponse buildPartial() { com.google.bigtable.admin.v2.ListTablesResponse result = new com.google.bigtable.admin.v2.ListTablesResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.ListTablesResponse result) { if (tablesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { tables_ = java.util.Collections.unmodifiableList(tables_); @@ -446,9 +459,13 @@ public com.google.bigtable.admin.v2.ListTablesResponse buildPartial() { } else { result.tables_ = tablesBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.ListTablesResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.nextPageToken_ = nextPageToken_; + } } @java.lang.Override @@ -526,6 +543,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListTablesResponse other) } if (!other.getNextPageToken().isEmpty()) { nextPageToken_ = other.nextPageToken_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -570,7 +588,7 @@ public Builder mergeFrom( case 18: { nextPageToken_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -1007,8 +1025,8 @@ public Builder setNextPageToken(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1026,8 +1044,8 @@ public Builder setNextPageToken(java.lang.String value) { * @return This builder for chaining. */ public Builder clearNextPageToken() { - nextPageToken_ = getDefaultInstance().getNextPageToken(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1050,8 +1068,8 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - nextPageToken_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java index 17266065d3..74bc373d0e 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java @@ -305,7 +305,9 @@ public ModCase getModCase() { } public static final int ID_FIELD_NUMBER = 1; - private volatile java.lang.Object id_; + + @SuppressWarnings("serial") + private volatile java.lang.Object id_ = ""; /** * * @@ -755,8 +757,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; id_ = ""; - if (createBuilder_ != null) { createBuilder_.clear(); } @@ -795,29 +797,34 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification bui public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification buildPartial() { com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification result = new com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification(this); - result.id_ = id_; - if (modCase_ == 2) { - if (createBuilder_ == null) { - result.mod_ = mod_; - } else { - result.mod_ = createBuilder_.build(); - } - } - if (modCase_ == 3) { - if (updateBuilder_ == null) { - result.mod_ = mod_; - } else { - result.mod_ = updateBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - if (modCase_ == 4) { - result.mod_ = mod_; - } - result.modCase_ = modCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0( + com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.id_ = id_; + } + } + + private void buildPartialOneofs( + com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification result) { + result.modCase_ = modCase_; + result.mod_ = this.mod_; + if (modCase_ == 2 && createBuilder_ != null) { + result.mod_ = createBuilder_.build(); + } + if (modCase_ == 3 && updateBuilder_ != null) { + result.mod_ = updateBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -872,6 +879,7 @@ public Builder mergeFrom( .getDefaultInstance()) return this; if (!other.getId().isEmpty()) { id_ = other.id_; + bitField0_ |= 0x00000001; onChanged(); } switch (other.getModCase()) { @@ -924,7 +932,7 @@ public Builder mergeFrom( case 10: { id_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -976,6 +984,8 @@ public Builder clearMod() { return this; } + private int bitField0_; + private java.lang.Object id_ = ""; /** * @@ -1037,8 +1047,8 @@ public Builder setId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - id_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1054,8 +1064,8 @@ public Builder setId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearId() { - id_ = getDefaultInstance().getId(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1076,8 +1086,8 @@ public Builder setIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - id_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1296,7 +1306,6 @@ public com.google.bigtable.admin.v2.ColumnFamilyOrBuilder getCreateOrBuilder() { } modCase_ = 2; onChanged(); - ; return createBuilder_; } @@ -1514,7 +1523,6 @@ public com.google.bigtable.admin.v2.ColumnFamilyOrBuilder getUpdateOrBuilder() { } modCase_ = 3; onChanged(); - ; return updateBuilder_; } @@ -1565,6 +1573,7 @@ public boolean getDrop() { * @return This builder for chaining. */ public Builder setDrop(boolean value) { + modCase_ = 4; mod_ = value; onChanged(); @@ -1660,7 +1669,9 @@ public com.google.protobuf.Parser getParserForType() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -1717,6 +1728,8 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int MODIFICATIONS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List modifications_; /** @@ -2025,15 +2038,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - if (modificationsBuilder_ == null) { modifications_ = java.util.Collections.emptyList(); } else { modifications_ = null; modificationsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -2061,19 +2074,32 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest build() { public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest buildPartial() { com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest result = new com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest result) { if (modificationsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { modifications_ = java.util.Collections.unmodifiableList(modifications_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.modifications_ = modifications_; } else { result.modifications_ = modificationsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } } @java.lang.Override @@ -2124,13 +2150,14 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ModifyColumnFamiliesReques return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (modificationsBuilder_ == null) { if (!other.modifications_.isEmpty()) { if (modifications_.isEmpty()) { modifications_ = other.modifications_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureModificationsIsMutable(); modifications_.addAll(other.modifications_); @@ -2143,7 +2170,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ModifyColumnFamiliesReques modificationsBuilder_.dispose(); modificationsBuilder_ = null; modifications_ = other.modifications_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); modificationsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getModificationsFieldBuilder() @@ -2182,7 +2209,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -2292,8 +2319,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2313,8 +2340,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -2339,8 +2366,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2349,12 +2376,12 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { modifications_ = java.util.Collections.emptyList(); private void ensureModificationsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { modifications_ = new java.util.ArrayList< com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification>( modifications_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -2637,7 +2664,7 @@ public Builder addAllModifications( public Builder clearModifications() { if (modificationsBuilder_ == null) { modifications_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { modificationsBuilder_.clear(); @@ -2807,7 +2834,7 @@ public Builder removeModifications(int index) { com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification.Builder, com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.ModificationOrBuilder>( modifications_, - ((bitField0_ & 0x00000001) != 0), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); modifications_ = null; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/OperationProgress.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/OperationProgress.java index c8dbdfc47e..bc24395350 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/OperationProgress.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/OperationProgress.java @@ -67,7 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PROGRESS_PERCENT_FIELD_NUMBER = 1; - private int progressPercent_; + private int progressPercent_ = 0; /** * * @@ -128,7 +128,7 @@ public com.google.protobuf.Timestamp getStartTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { - return getStartTime(); + return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_; } public static final int END_TIME_FIELD_NUMBER = 3; @@ -177,7 +177,7 @@ public com.google.protobuf.Timestamp getEndTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { - return getEndTime(); + return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } private byte memoizedIsInitialized = -1; @@ -406,18 +406,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; progressPercent_ = 0; - - if (startTimeBuilder_ == null) { - startTime_ = null; - } else { - startTime_ = null; + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - if (endTimeBuilder_ == null) { - endTime_ = null; - } else { - endTime_ = null; + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } return this; @@ -447,21 +445,26 @@ public com.google.bigtable.admin.v2.OperationProgress build() { public com.google.bigtable.admin.v2.OperationProgress buildPartial() { com.google.bigtable.admin.v2.OperationProgress result = new com.google.bigtable.admin.v2.OperationProgress(this); - result.progressPercent_ = progressPercent_; - if (startTimeBuilder_ == null) { - result.startTime_ = startTime_; - } else { - result.startTime_ = startTimeBuilder_.build(); - } - if (endTimeBuilder_ == null) { - result.endTime_ = endTime_; - } else { - result.endTime_ = endTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.OperationProgress result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.progressPercent_ = progressPercent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -545,19 +548,19 @@ public Builder mergeFrom( case 8: { progressPercent_ = input.readInt32(); - + bitField0_ |= 0x00000001; break; } // case 8 case 18: { input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -577,6 +580,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int progressPercent_; /** * @@ -610,6 +615,7 @@ public int getProgressPercent() { public Builder setProgressPercent(int value) { progressPercent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -626,7 +632,7 @@ public Builder setProgressPercent(int value) { * @return This builder for chaining. */ public Builder clearProgressPercent() { - + bitField0_ = (bitField0_ & ~0x00000001); progressPercent_ = 0; onChanged(); return this; @@ -650,7 +656,7 @@ public Builder clearProgressPercent() { * @return Whether the startTime field is set. */ public boolean hasStartTime() { - return startTimeBuilder_ != null || startTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -685,11 +691,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } startTime_ = value; - onChanged(); } else { startTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -704,11 +710,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (startTimeBuilder_ == null) { startTime_ = builderForValue.build(); - onChanged(); } else { startTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -722,17 +728,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu */ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { if (startTimeBuilder_ == null) { - if (startTime_ != null) { - startTime_ = - com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && startTime_ != null + && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getStartTimeBuilder().mergeFrom(value); } else { startTime_ = value; } - onChanged(); } else { startTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -745,14 +752,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp start_time = 2; */ public Builder clearStartTime() { - if (startTimeBuilder_ == null) { - startTime_ = null; - onChanged(); - } else { - startTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -765,7 +771,7 @@ public Builder clearStartTime() { * .google.protobuf.Timestamp start_time = 2; */ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getStartTimeFieldBuilder().getBuilder(); } @@ -830,7 +836,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { * @return Whether the endTime field is set. */ public boolean hasEndTime() { - return endTimeBuilder_ != null || endTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -867,11 +873,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } endTime_ = value; - onChanged(); } else { endTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -887,11 +893,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (endTimeBuilder_ == null) { endTime_ = builderForValue.build(); - onChanged(); } else { endTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -906,17 +912,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) */ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { if (endTimeBuilder_ == null) { - if (endTime_ != null) { - endTime_ = - com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && endTime_ != null + && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getEndTimeBuilder().mergeFrom(value); } else { endTime_ = value; } - onChanged(); } else { endTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -930,14 +937,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp end_time = 3; */ public Builder clearEndTime() { - if (endTimeBuilder_ == null) { - endTime_ = null; - onChanged(); - } else { - endTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -951,7 +957,7 @@ public Builder clearEndTime() { * .google.protobuf.Timestamp end_time = 3; */ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getEndTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/OptimizeRestoredTableMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/OptimizeRestoredTableMetadata.java index 7b2c946018..6f3ebb1e72 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/OptimizeRestoredTableMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/OptimizeRestoredTableMetadata.java @@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -164,7 +166,9 @@ public com.google.bigtable.admin.v2.OperationProgress getProgress() { */ @java.lang.Override public com.google.bigtable.admin.v2.OperationProgressOrBuilder getProgressOrBuilder() { - return getProgress(); + return progress_ == null + ? com.google.bigtable.admin.v2.OperationProgress.getDefaultInstance() + : progress_; } private byte memoizedIsInitialized = -1; @@ -382,12 +386,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (progressBuilder_ == null) { - progress_ = null; - } else { - progress_ = null; + progress_ = null; + if (progressBuilder_ != null) { + progressBuilder_.dispose(); progressBuilder_ = null; } return this; @@ -417,16 +420,23 @@ public com.google.bigtable.admin.v2.OptimizeRestoredTableMetadata build() { public com.google.bigtable.admin.v2.OptimizeRestoredTableMetadata buildPartial() { com.google.bigtable.admin.v2.OptimizeRestoredTableMetadata result = new com.google.bigtable.admin.v2.OptimizeRestoredTableMetadata(this); - result.name_ = name_; - if (progressBuilder_ == null) { - result.progress_ = progress_; - } else { - result.progress_ = progressBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.OptimizeRestoredTableMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.progress_ = progressBuilder_ == null ? progress_ : progressBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -475,6 +485,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.OptimizeRestoredTableMetad return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasProgress()) { @@ -509,13 +520,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getProgressFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -535,6 +546,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -596,8 +609,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -613,8 +626,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -635,8 +648,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -659,7 +672,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the progress field is set. */ public boolean hasProgress() { - return progressBuilder_ != null || progress_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -696,11 +709,11 @@ public Builder setProgress(com.google.bigtable.admin.v2.OperationProgress value) throw new NullPointerException(); } progress_ = value; - onChanged(); } else { progressBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -716,11 +729,11 @@ public Builder setProgress( com.google.bigtable.admin.v2.OperationProgress.Builder builderForValue) { if (progressBuilder_ == null) { progress_ = builderForValue.build(); - onChanged(); } else { progressBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -734,19 +747,18 @@ public Builder setProgress( */ public Builder mergeProgress(com.google.bigtable.admin.v2.OperationProgress value) { if (progressBuilder_ == null) { - if (progress_ != null) { - progress_ = - com.google.bigtable.admin.v2.OperationProgress.newBuilder(progress_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && progress_ != null + && progress_ != com.google.bigtable.admin.v2.OperationProgress.getDefaultInstance()) { + getProgressBuilder().mergeFrom(value); } else { progress_ = value; } - onChanged(); } else { progressBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -759,14 +771,13 @@ public Builder mergeProgress(com.google.bigtable.admin.v2.OperationProgress valu * .google.bigtable.admin.v2.OperationProgress progress = 2; */ public Builder clearProgress() { - if (progressBuilder_ == null) { - progress_ = null; - onChanged(); - } else { - progress_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + progress_ = null; + if (progressBuilder_ != null) { + progressBuilder_.dispose(); progressBuilder_ = null; } - + onChanged(); return this; } /** @@ -779,7 +790,7 @@ public Builder clearProgress() { * .google.bigtable.admin.v2.OperationProgress progress = 2; */ public com.google.bigtable.admin.v2.OperationProgress.Builder getProgressBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getProgressFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateClusterMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateClusterMetadata.java index 6ea994b7ca..9a77f1caf1 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateClusterMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateClusterMetadata.java @@ -108,7 +108,7 @@ public com.google.protobuf.Timestamp getRequestTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { - return getRequestTime(); + return requestTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : requestTime_; } public static final int FINISH_TIME_FIELD_NUMBER = 2; @@ -154,7 +154,7 @@ public com.google.protobuf.Timestamp getFinishTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() { - return getFinishTime(); + return finishTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : finishTime_; } public static final int ORIGINAL_REQUEST_FIELD_NUMBER = 3; @@ -203,7 +203,9 @@ public com.google.bigtable.admin.v2.PartialUpdateClusterRequest getOriginalReque @java.lang.Override public com.google.bigtable.admin.v2.PartialUpdateClusterRequestOrBuilder getOriginalRequestOrBuilder() { - return getOriginalRequest(); + return originalRequest_ == null + ? com.google.bigtable.admin.v2.PartialUpdateClusterRequest.getDefaultInstance() + : originalRequest_; } private byte memoizedIsInitialized = -1; @@ -437,22 +439,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (requestTimeBuilder_ == null) { - requestTime_ = null; - } else { - requestTime_ = null; + bitField0_ = 0; + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - if (finishTimeBuilder_ == null) { - finishTime_ = null; - } else { - finishTime_ = null; + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - } else { - originalRequest_ = null; + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } return this; @@ -482,25 +482,28 @@ public com.google.bigtable.admin.v2.PartialUpdateClusterMetadata build() { public com.google.bigtable.admin.v2.PartialUpdateClusterMetadata buildPartial() { com.google.bigtable.admin.v2.PartialUpdateClusterMetadata result = new com.google.bigtable.admin.v2.PartialUpdateClusterMetadata(this); - if (requestTimeBuilder_ == null) { - result.requestTime_ = requestTime_; - } else { - result.requestTime_ = requestTimeBuilder_.build(); - } - if (finishTimeBuilder_ == null) { - result.finishTime_ = finishTime_; - } else { - result.finishTime_ = finishTimeBuilder_.build(); - } - if (originalRequestBuilder_ == null) { - result.originalRequest_ = originalRequest_; - } else { - result.originalRequest_ = originalRequestBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.PartialUpdateClusterMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.requestTime_ = + requestTimeBuilder_ == null ? requestTime_ : requestTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.finishTime_ = finishTimeBuilder_ == null ? finishTime_ : finishTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.originalRequest_ = + originalRequestBuilder_ == null ? originalRequest_ : originalRequestBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -585,19 +588,19 @@ public Builder mergeFrom( case 10: { input.readMessage(getRequestTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getFinishTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getOriginalRequestFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -617,6 +620,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.Timestamp requestTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, @@ -635,7 +640,7 @@ public Builder mergeFrom( * @return Whether the requestTime field is set. */ public boolean hasRequestTime() { - return requestTimeBuilder_ != null || requestTime_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -672,11 +677,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } requestTime_ = value; - onChanged(); } else { requestTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -691,11 +696,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (requestTimeBuilder_ == null) { requestTime_ = builderForValue.build(); - onChanged(); } else { requestTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -709,19 +714,18 @@ public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForVa */ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { if (requestTimeBuilder_ == null) { - if (requestTime_ != null) { - requestTime_ = - com.google.protobuf.Timestamp.newBuilder(requestTime_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && requestTime_ != null + && requestTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getRequestTimeBuilder().mergeFrom(value); } else { requestTime_ = value; } - onChanged(); } else { requestTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -734,14 +738,13 @@ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp request_time = 1; */ public Builder clearRequestTime() { - if (requestTimeBuilder_ == null) { - requestTime_ = null; - onChanged(); - } else { - requestTime_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -754,7 +757,7 @@ public Builder clearRequestTime() { * .google.protobuf.Timestamp request_time = 1; */ public com.google.protobuf.Timestamp.Builder getRequestTimeBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getRequestTimeFieldBuilder().getBuilder(); } @@ -820,7 +823,7 @@ public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { * @return Whether the finishTime field is set. */ public boolean hasFinishTime() { - return finishTimeBuilder_ != null || finishTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -857,11 +860,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } finishTime_ = value; - onChanged(); } else { finishTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -876,11 +879,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (finishTimeBuilder_ == null) { finishTime_ = builderForValue.build(); - onChanged(); } else { finishTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -894,17 +897,18 @@ public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { if (finishTimeBuilder_ == null) { - if (finishTime_ != null) { - finishTime_ = - com.google.protobuf.Timestamp.newBuilder(finishTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && finishTime_ != null + && finishTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getFinishTimeBuilder().mergeFrom(value); } else { finishTime_ = value; } - onChanged(); } else { finishTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -917,14 +921,13 @@ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp finish_time = 2; */ public Builder clearFinishTime() { - if (finishTimeBuilder_ == null) { - finishTime_ = null; - onChanged(); - } else { - finishTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -937,7 +940,7 @@ public Builder clearFinishTime() { * .google.protobuf.Timestamp finish_time = 2; */ public com.google.protobuf.Timestamp.Builder getFinishTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getFinishTimeFieldBuilder().getBuilder(); } @@ -1003,7 +1006,7 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() { * @return Whether the originalRequest field is set. */ public boolean hasOriginalRequest() { - return originalRequestBuilder_ != null || originalRequest_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1041,11 +1044,11 @@ public Builder setOriginalRequest( throw new NullPointerException(); } originalRequest_ = value; - onChanged(); } else { originalRequestBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1061,11 +1064,11 @@ public Builder setOriginalRequest( com.google.bigtable.admin.v2.PartialUpdateClusterRequest.Builder builderForValue) { if (originalRequestBuilder_ == null) { originalRequest_ = builderForValue.build(); - onChanged(); } else { originalRequestBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1080,19 +1083,19 @@ public Builder setOriginalRequest( public Builder mergeOriginalRequest( com.google.bigtable.admin.v2.PartialUpdateClusterRequest value) { if (originalRequestBuilder_ == null) { - if (originalRequest_ != null) { - originalRequest_ = - com.google.bigtable.admin.v2.PartialUpdateClusterRequest.newBuilder(originalRequest_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && originalRequest_ != null + && originalRequest_ + != com.google.bigtable.admin.v2.PartialUpdateClusterRequest.getDefaultInstance()) { + getOriginalRequestBuilder().mergeFrom(value); } else { originalRequest_ = value; } - onChanged(); } else { originalRequestBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1105,14 +1108,13 @@ public Builder mergeOriginalRequest( * .google.bigtable.admin.v2.PartialUpdateClusterRequest original_request = 3; */ public Builder clearOriginalRequest() { - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - onChanged(); - } else { - originalRequest_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - + onChanged(); return this; } /** @@ -1126,7 +1128,7 @@ public Builder clearOriginalRequest() { */ public com.google.bigtable.admin.v2.PartialUpdateClusterRequest.Builder getOriginalRequestBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getOriginalRequestFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateClusterRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateClusterRequest.java index 51fab538cd..ed2fb7e554 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateClusterRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateClusterRequest.java @@ -114,7 +114,7 @@ public com.google.bigtable.admin.v2.Cluster getCluster() { */ @java.lang.Override public com.google.bigtable.admin.v2.ClusterOrBuilder getClusterOrBuilder() { - return getCluster(); + return cluster_ == null ? com.google.bigtable.admin.v2.Cluster.getDefaultInstance() : cluster_; } public static final int UPDATE_MASK_FIELD_NUMBER = 2; @@ -163,7 +163,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } private byte memoizedIsInitialized = -1; @@ -383,16 +383,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (clusterBuilder_ == null) { - cluster_ = null; - } else { - cluster_ = null; + bitField0_ = 0; + cluster_ = null; + if (clusterBuilder_ != null) { + clusterBuilder_.dispose(); clusterBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } return this; @@ -422,20 +421,23 @@ public com.google.bigtable.admin.v2.PartialUpdateClusterRequest build() { public com.google.bigtable.admin.v2.PartialUpdateClusterRequest buildPartial() { com.google.bigtable.admin.v2.PartialUpdateClusterRequest result = new com.google.bigtable.admin.v2.PartialUpdateClusterRequest(this); - if (clusterBuilder_ == null) { - result.cluster_ = cluster_; - } else { - result.cluster_ = clusterBuilder_.build(); - } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.PartialUpdateClusterRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.cluster_ = clusterBuilder_ == null ? cluster_ : clusterBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -517,13 +519,13 @@ public Builder mergeFrom( case 10: { input.readMessage(getClusterFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -543,6 +545,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.Cluster cluster_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.Cluster, @@ -564,7 +568,7 @@ public Builder mergeFrom( * @return Whether the cluster field is set. */ public boolean hasCluster() { - return clusterBuilder_ != null || cluster_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -607,11 +611,11 @@ public Builder setCluster(com.google.bigtable.admin.v2.Cluster value) { throw new NullPointerException(); } cluster_ = value; - onChanged(); } else { clusterBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -629,11 +633,11 @@ public Builder setCluster(com.google.bigtable.admin.v2.Cluster value) { public Builder setCluster(com.google.bigtable.admin.v2.Cluster.Builder builderForValue) { if (clusterBuilder_ == null) { cluster_ = builderForValue.build(); - onChanged(); } else { clusterBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -650,19 +654,18 @@ public Builder setCluster(com.google.bigtable.admin.v2.Cluster.Builder builderFo */ public Builder mergeCluster(com.google.bigtable.admin.v2.Cluster value) { if (clusterBuilder_ == null) { - if (cluster_ != null) { - cluster_ = - com.google.bigtable.admin.v2.Cluster.newBuilder(cluster_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && cluster_ != null + && cluster_ != com.google.bigtable.admin.v2.Cluster.getDefaultInstance()) { + getClusterBuilder().mergeFrom(value); } else { cluster_ = value; } - onChanged(); } else { clusterBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -678,14 +681,13 @@ public Builder mergeCluster(com.google.bigtable.admin.v2.Cluster value) { * */ public Builder clearCluster() { - if (clusterBuilder_ == null) { - cluster_ = null; - onChanged(); - } else { - cluster_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + cluster_ = null; + if (clusterBuilder_ != null) { + clusterBuilder_.dispose(); clusterBuilder_ = null; } - + onChanged(); return this; } /** @@ -701,7 +703,7 @@ public Builder clearCluster() { * */ public com.google.bigtable.admin.v2.Cluster.Builder getClusterBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getClusterFieldBuilder().getBuilder(); } @@ -774,7 +776,7 @@ public com.google.bigtable.admin.v2.ClusterOrBuilder getClusterOrBuilder() { * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -813,11 +815,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -833,11 +835,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -852,17 +854,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -876,14 +879,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -897,7 +899,7 @@ public Builder clearUpdateMask() { * */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java index c3dc82149c..ccd12c69b4 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java @@ -116,7 +116,9 @@ public com.google.bigtable.admin.v2.Instance getInstance() { */ @java.lang.Override public com.google.bigtable.admin.v2.InstanceOrBuilder getInstanceOrBuilder() { - return getInstance(); + return instance_ == null + ? com.google.bigtable.admin.v2.Instance.getDefaultInstance() + : instance_; } public static final int UPDATE_MASK_FIELD_NUMBER = 2; @@ -168,7 +170,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } private byte memoizedIsInitialized = -1; @@ -388,16 +390,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (instanceBuilder_ == null) { - instance_ = null; - } else { - instance_ = null; + bitField0_ = 0; + instance_ = null; + if (instanceBuilder_ != null) { + instanceBuilder_.dispose(); instanceBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } return this; @@ -427,20 +428,23 @@ public com.google.bigtable.admin.v2.PartialUpdateInstanceRequest build() { public com.google.bigtable.admin.v2.PartialUpdateInstanceRequest buildPartial() { com.google.bigtable.admin.v2.PartialUpdateInstanceRequest result = new com.google.bigtable.admin.v2.PartialUpdateInstanceRequest(this); - if (instanceBuilder_ == null) { - result.instance_ = instance_; - } else { - result.instance_ = instanceBuilder_.build(); - } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.PartialUpdateInstanceRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.instance_ = instanceBuilder_ == null ? instance_ : instanceBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -522,13 +526,13 @@ public Builder mergeFrom( case 10: { input.readMessage(getInstanceFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -548,6 +552,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.Instance instance_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.Instance, @@ -568,7 +574,7 @@ public Builder mergeFrom( * @return Whether the instance field is set. */ public boolean hasInstance() { - return instanceBuilder_ != null || instance_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -609,11 +615,11 @@ public Builder setInstance(com.google.bigtable.admin.v2.Instance value) { throw new NullPointerException(); } instance_ = value; - onChanged(); } else { instanceBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -630,11 +636,11 @@ public Builder setInstance(com.google.bigtable.admin.v2.Instance value) { public Builder setInstance(com.google.bigtable.admin.v2.Instance.Builder builderForValue) { if (instanceBuilder_ == null) { instance_ = builderForValue.build(); - onChanged(); } else { instanceBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -650,19 +656,18 @@ public Builder setInstance(com.google.bigtable.admin.v2.Instance.Builder builder */ public Builder mergeInstance(com.google.bigtable.admin.v2.Instance value) { if (instanceBuilder_ == null) { - if (instance_ != null) { - instance_ = - com.google.bigtable.admin.v2.Instance.newBuilder(instance_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && instance_ != null + && instance_ != com.google.bigtable.admin.v2.Instance.getDefaultInstance()) { + getInstanceBuilder().mergeFrom(value); } else { instance_ = value; } - onChanged(); } else { instanceBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -677,14 +682,13 @@ public Builder mergeInstance(com.google.bigtable.admin.v2.Instance value) { * */ public Builder clearInstance() { - if (instanceBuilder_ == null) { - instance_ = null; - onChanged(); - } else { - instance_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + instance_ = null; + if (instanceBuilder_ != null) { + instanceBuilder_.dispose(); instanceBuilder_ = null; } - + onChanged(); return this; } /** @@ -699,7 +703,7 @@ public Builder clearInstance() { * */ public com.google.bigtable.admin.v2.Instance.Builder getInstanceBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getInstanceFieldBuilder().getBuilder(); } @@ -771,7 +775,7 @@ public com.google.bigtable.admin.v2.InstanceOrBuilder getInstanceOrBuilder() { * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -812,11 +816,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -833,11 +837,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -853,17 +857,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -878,14 +883,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -900,7 +904,7 @@ public Builder clearUpdateMask() { * */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreInfo.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreInfo.java index 7f12b4a44c..d10c5dbf95 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreInfo.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreInfo.java @@ -112,7 +112,7 @@ public SourceInfoCase getSourceInfoCase() { } public static final int SOURCE_TYPE_FIELD_NUMBER = 1; - private int sourceType_; + private int sourceType_ = 0; /** * * @@ -141,9 +141,8 @@ public int getSourceTypeValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.RestoreSourceType getSourceType() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.RestoreSourceType result = - com.google.bigtable.admin.v2.RestoreSourceType.valueOf(sourceType_); + com.google.bigtable.admin.v2.RestoreSourceType.forNumber(sourceType_); return result == null ? com.google.bigtable.admin.v2.RestoreSourceType.UNRECOGNIZED : result; } @@ -425,8 +424,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; sourceType_ = 0; - if (backupInfoBuilder_ != null) { backupInfoBuilder_.clear(); } @@ -459,19 +458,29 @@ public com.google.bigtable.admin.v2.RestoreInfo build() { public com.google.bigtable.admin.v2.RestoreInfo buildPartial() { com.google.bigtable.admin.v2.RestoreInfo result = new com.google.bigtable.admin.v2.RestoreInfo(this); - result.sourceType_ = sourceType_; - if (sourceInfoCase_ == 2) { - if (backupInfoBuilder_ == null) { - result.sourceInfo_ = sourceInfo_; - } else { - result.sourceInfo_ = backupInfoBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - result.sourceInfoCase_ = sourceInfoCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.RestoreInfo result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.sourceType_ = sourceType_; + } + } + + private void buildPartialOneofs(com.google.bigtable.admin.v2.RestoreInfo result) { + result.sourceInfoCase_ = sourceInfoCase_; + result.sourceInfo_ = this.sourceInfo_; + if (sourceInfoCase_ == 2 && backupInfoBuilder_ != null) { + result.sourceInfo_ = backupInfoBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -560,7 +569,7 @@ public Builder mergeFrom( case 8: { sourceType_ = input.readEnum(); - + bitField0_ |= 0x00000001; break; } // case 8 case 18: @@ -600,6 +609,8 @@ public Builder clearSourceInfo() { return this; } + private int bitField0_; + private int sourceType_ = 0; /** * @@ -629,8 +640,8 @@ public int getSourceTypeValue() { * @return This builder for chaining. */ public Builder setSourceTypeValue(int value) { - sourceType_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -647,9 +658,8 @@ public Builder setSourceTypeValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.RestoreSourceType getSourceType() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.RestoreSourceType result = - com.google.bigtable.admin.v2.RestoreSourceType.valueOf(sourceType_); + com.google.bigtable.admin.v2.RestoreSourceType.forNumber(sourceType_); return result == null ? com.google.bigtable.admin.v2.RestoreSourceType.UNRECOGNIZED : result; } /** @@ -668,7 +678,7 @@ public Builder setSourceType(com.google.bigtable.admin.v2.RestoreSourceType valu if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; sourceType_ = value.getNumber(); onChanged(); return this; @@ -685,7 +695,7 @@ public Builder setSourceType(com.google.bigtable.admin.v2.RestoreSourceType valu * @return This builder for chaining. */ public Builder clearSourceType() { - + bitField0_ = (bitField0_ & ~0x00000001); sourceType_ = 0; onChanged(); return this; @@ -905,7 +915,6 @@ public com.google.bigtable.admin.v2.BackupInfoOrBuilder getBackupInfoOrBuilder() } sourceInfoCase_ = 2; onChanged(); - ; return backupInfoBuilder_; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadata.java index a5bda7dd29..4ed2d5c1fa 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadata.java @@ -115,7 +115,9 @@ public SourceInfoCase getSourceInfoCase() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -164,7 +166,7 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int SOURCE_TYPE_FIELD_NUMBER = 2; - private int sourceType_; + private int sourceType_ = 0; /** * * @@ -193,9 +195,8 @@ public int getSourceTypeValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.RestoreSourceType getSourceType() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.RestoreSourceType result = - com.google.bigtable.admin.v2.RestoreSourceType.valueOf(sourceType_); + com.google.bigtable.admin.v2.RestoreSourceType.forNumber(sourceType_); return result == null ? com.google.bigtable.admin.v2.RestoreSourceType.UNRECOGNIZED : result; } @@ -231,7 +232,9 @@ public com.google.bigtable.admin.v2.BackupInfoOrBuilder getBackupInfoOrBuilder() } public static final int OPTIMIZE_TABLE_OPERATION_NAME_FIELD_NUMBER = 4; - private volatile java.lang.Object optimizeTableOperationName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object optimizeTableOperationName_ = ""; /** * * @@ -343,7 +346,9 @@ public com.google.bigtable.admin.v2.OperationProgress getProgress() { */ @java.lang.Override public com.google.bigtable.admin.v2.OperationProgressOrBuilder getProgressOrBuilder() { - return getProgress(); + return progress_ == null + ? com.google.bigtable.admin.v2.OperationProgress.getDefaultInstance() + : progress_; } private byte memoizedIsInitialized = -1; @@ -606,19 +611,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - sourceType_ = 0; - if (backupInfoBuilder_ != null) { backupInfoBuilder_.clear(); } optimizeTableOperationName_ = ""; - - if (progressBuilder_ == null) { - progress_ = null; - } else { - progress_ = null; + progress_ = null; + if (progressBuilder_ != null) { + progressBuilder_.dispose(); progressBuilder_ = null; } sourceInfoCase_ = 0; @@ -650,26 +652,38 @@ public com.google.bigtable.admin.v2.RestoreTableMetadata build() { public com.google.bigtable.admin.v2.RestoreTableMetadata buildPartial() { com.google.bigtable.admin.v2.RestoreTableMetadata result = new com.google.bigtable.admin.v2.RestoreTableMetadata(this); - result.name_ = name_; - result.sourceType_ = sourceType_; - if (sourceInfoCase_ == 3) { - if (backupInfoBuilder_ == null) { - result.sourceInfo_ = sourceInfo_; - } else { - result.sourceInfo_ = backupInfoBuilder_.build(); - } - } - result.optimizeTableOperationName_ = optimizeTableOperationName_; - if (progressBuilder_ == null) { - result.progress_ = progress_; - } else { - result.progress_ = progressBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.sourceInfoCase_ = sourceInfoCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.RestoreTableMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.sourceType_ = sourceType_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.optimizeTableOperationName_ = optimizeTableOperationName_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.progress_ = progressBuilder_ == null ? progress_ : progressBuilder_.build(); + } + } + + private void buildPartialOneofs(com.google.bigtable.admin.v2.RestoreTableMetadata result) { + result.sourceInfoCase_ = sourceInfoCase_; + result.sourceInfo_ = this.sourceInfo_; + if (sourceInfoCase_ == 3 && backupInfoBuilder_ != null) { + result.sourceInfo_ = backupInfoBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -718,6 +732,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.RestoreTableMetadata other return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.sourceType_ != 0) { @@ -725,6 +740,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.RestoreTableMetadata other } if (!other.getOptimizeTableOperationName().isEmpty()) { optimizeTableOperationName_ = other.optimizeTableOperationName_; + bitField0_ |= 0x00000008; onChanged(); } if (other.hasProgress()) { @@ -770,13 +786,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { sourceType_ = input.readEnum(); - + bitField0_ |= 0x00000002; break; } // case 16 case 26: @@ -788,13 +804,13 @@ public Builder mergeFrom( case 34: { optimizeTableOperationName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000008; break; } // case 34 case 42: { input.readMessage(getProgressFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 default: @@ -828,6 +844,8 @@ public Builder clearSourceInfo() { return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -889,8 +907,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -906,8 +924,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -928,8 +946,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -963,8 +981,8 @@ public int getSourceTypeValue() { * @return This builder for chaining. */ public Builder setSourceTypeValue(int value) { - sourceType_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -981,9 +999,8 @@ public Builder setSourceTypeValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.RestoreSourceType getSourceType() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.RestoreSourceType result = - com.google.bigtable.admin.v2.RestoreSourceType.valueOf(sourceType_); + com.google.bigtable.admin.v2.RestoreSourceType.forNumber(sourceType_); return result == null ? com.google.bigtable.admin.v2.RestoreSourceType.UNRECOGNIZED : result; } /** @@ -1002,7 +1019,7 @@ public Builder setSourceType(com.google.bigtable.admin.v2.RestoreSourceType valu if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000002; sourceType_ = value.getNumber(); onChanged(); return this; @@ -1019,7 +1036,7 @@ public Builder setSourceType(com.google.bigtable.admin.v2.RestoreSourceType valu * @return This builder for chaining. */ public Builder clearSourceType() { - + bitField0_ = (bitField0_ & ~0x00000002); sourceType_ = 0; onChanged(); return this; @@ -1162,7 +1179,6 @@ public com.google.bigtable.admin.v2.BackupInfoOrBuilder getBackupInfoOrBuilder() } sourceInfoCase_ = 3; onChanged(); - ; return backupInfoBuilder_; } @@ -1251,8 +1267,8 @@ public Builder setOptimizeTableOperationName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - optimizeTableOperationName_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1276,8 +1292,8 @@ public Builder setOptimizeTableOperationName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearOptimizeTableOperationName() { - optimizeTableOperationName_ = getDefaultInstance().getOptimizeTableOperationName(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -1306,8 +1322,8 @@ public Builder setOptimizeTableOperationNameBytes(com.google.protobuf.ByteString throw new NullPointerException(); } checkByteStringIsUtf8(value); - optimizeTableOperationName_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1331,7 +1347,7 @@ public Builder setOptimizeTableOperationNameBytes(com.google.protobuf.ByteString * @return Whether the progress field is set. */ public boolean hasProgress() { - return progressBuilder_ != null || progress_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -1370,11 +1386,11 @@ public Builder setProgress(com.google.bigtable.admin.v2.OperationProgress value) throw new NullPointerException(); } progress_ = value; - onChanged(); } else { progressBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1391,11 +1407,11 @@ public Builder setProgress( com.google.bigtable.admin.v2.OperationProgress.Builder builderForValue) { if (progressBuilder_ == null) { progress_ = builderForValue.build(); - onChanged(); } else { progressBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1410,19 +1426,18 @@ public Builder setProgress( */ public Builder mergeProgress(com.google.bigtable.admin.v2.OperationProgress value) { if (progressBuilder_ == null) { - if (progress_ != null) { - progress_ = - com.google.bigtable.admin.v2.OperationProgress.newBuilder(progress_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && progress_ != null + && progress_ != com.google.bigtable.admin.v2.OperationProgress.getDefaultInstance()) { + getProgressBuilder().mergeFrom(value); } else { progress_ = value; } - onChanged(); } else { progressBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1436,14 +1451,13 @@ public Builder mergeProgress(com.google.bigtable.admin.v2.OperationProgress valu * .google.bigtable.admin.v2.OperationProgress progress = 5; */ public Builder clearProgress() { - if (progressBuilder_ == null) { - progress_ = null; - onChanged(); - } else { - progress_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + progress_ = null; + if (progressBuilder_ != null) { + progressBuilder_.dispose(); progressBuilder_ = null; } - + onChanged(); return this; } /** @@ -1457,7 +1471,7 @@ public Builder clearProgress() { * .google.bigtable.admin.v2.OperationProgress progress = 5; */ public com.google.bigtable.admin.v2.OperationProgress.Builder getProgressBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getProgressFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java index 1ca6255dcb..816ceaae05 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java @@ -114,7 +114,9 @@ public SourceCase getSourceCase() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -171,7 +173,9 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int TABLE_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object tableId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object tableId_ = ""; /** * * @@ -527,10 +531,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - tableId_ = ""; - sourceCase_ = 0; source_ = null; return this; @@ -560,16 +563,29 @@ public com.google.bigtable.admin.v2.RestoreTableRequest build() { public com.google.bigtable.admin.v2.RestoreTableRequest buildPartial() { com.google.bigtable.admin.v2.RestoreTableRequest result = new com.google.bigtable.admin.v2.RestoreTableRequest(this); - result.parent_ = parent_; - result.tableId_ = tableId_; - if (sourceCase_ == 3) { - result.source_ = source_; + if (bitField0_ != 0) { + buildPartial0(result); } - result.sourceCase_ = sourceCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.RestoreTableRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.tableId_ = tableId_; + } + } + + private void buildPartialOneofs(com.google.bigtable.admin.v2.RestoreTableRequest result) { + result.sourceCase_ = sourceCase_; + result.source_ = this.source_; + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -618,10 +634,12 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.RestoreTableRequest other) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getTableId().isEmpty()) { tableId_ = other.tableId_; + bitField0_ |= 0x00000002; onChanged(); } switch (other.getSourceCase()) { @@ -666,13 +684,13 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { tableId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: @@ -713,6 +731,8 @@ public Builder clearSource() { return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -786,8 +806,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -807,8 +827,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -833,8 +853,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -909,8 +929,8 @@ public Builder setTableId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - tableId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -929,8 +949,8 @@ public Builder setTableId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTableId() { - tableId_ = getDefaultInstance().getTableId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -954,8 +974,8 @@ public Builder setTableIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - tableId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java index 15afea9cec..9493eb9f28 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java @@ -236,7 +236,9 @@ private State(int value) { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -333,11 +335,13 @@ public com.google.bigtable.admin.v2.Table getSourceTable() { */ @java.lang.Override public com.google.bigtable.admin.v2.TableOrBuilder getSourceTableOrBuilder() { - return getSourceTable(); + return sourceTable_ == null + ? com.google.bigtable.admin.v2.Table.getDefaultInstance() + : sourceTable_; } public static final int DATA_SIZE_BYTES_FIELD_NUMBER = 3; - private long dataSizeBytes_; + private long dataSizeBytes_ = 0L; /** * * @@ -400,7 +404,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } public static final int DELETE_TIME_FIELD_NUMBER = 5; @@ -452,11 +456,11 @@ public com.google.protobuf.Timestamp getDeleteTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getDeleteTimeOrBuilder() { - return getDeleteTime(); + return deleteTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : deleteTime_; } public static final int STATE_FIELD_NUMBER = 6; - private int state_; + private int state_ = 0; /** * * @@ -485,14 +489,15 @@ public int getStateValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.Snapshot.State getState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Snapshot.State result = - com.google.bigtable.admin.v2.Snapshot.State.valueOf(state_); + com.google.bigtable.admin.v2.Snapshot.State.forNumber(state_); return result == null ? com.google.bigtable.admin.v2.Snapshot.State.UNRECOGNIZED : result; } public static final int DESCRIPTION_FIELD_NUMBER = 7; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -809,32 +814,26 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (sourceTableBuilder_ == null) { - sourceTable_ = null; - } else { - sourceTable_ = null; + sourceTable_ = null; + if (sourceTableBuilder_ != null) { + sourceTableBuilder_.dispose(); sourceTableBuilder_ = null; } dataSizeBytes_ = 0L; - - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - if (deleteTimeBuilder_ == null) { - deleteTime_ = null; - } else { - deleteTime_ = null; + deleteTime_ = null; + if (deleteTimeBuilder_ != null) { + deleteTimeBuilder_.dispose(); deleteTimeBuilder_ = null; } state_ = 0; - description_ = ""; - return this; } @@ -862,29 +861,39 @@ public com.google.bigtable.admin.v2.Snapshot build() { public com.google.bigtable.admin.v2.Snapshot buildPartial() { com.google.bigtable.admin.v2.Snapshot result = new com.google.bigtable.admin.v2.Snapshot(this); - result.name_ = name_; - if (sourceTableBuilder_ == null) { - result.sourceTable_ = sourceTable_; - } else { - result.sourceTable_ = sourceTableBuilder_.build(); - } - result.dataSizeBytes_ = dataSizeBytes_; - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); - } - if (deleteTimeBuilder_ == null) { - result.deleteTime_ = deleteTime_; - } else { - result.deleteTime_ = deleteTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.state_ = state_; - result.description_ = description_; onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.Snapshot result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.sourceTable_ = + sourceTableBuilder_ == null ? sourceTable_ : sourceTableBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.dataSizeBytes_ = dataSizeBytes_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.deleteTime_ = deleteTimeBuilder_ == null ? deleteTime_ : deleteTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.state_ = state_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.description_ = description_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -932,6 +941,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Snapshot other) { if (other == com.google.bigtable.admin.v2.Snapshot.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasSourceTable()) { @@ -951,6 +961,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Snapshot other) { } if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000040; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -982,43 +993,43 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getSourceTableFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { dataSizeBytes_ = input.readInt64(); - + bitField0_ |= 0x00000004; break; } // case 24 case 34: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 34 case 42: { input.readMessage(getDeleteTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 case 48: { state_ = input.readEnum(); - + bitField0_ |= 0x00000020; break; } // case 48 case 58: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000040; break; } // case 58 default: @@ -1038,6 +1049,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -1105,8 +1118,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1124,8 +1137,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1148,8 +1161,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1172,7 +1185,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the sourceTable field is set. */ public boolean hasSourceTable() { - return sourceTableBuilder_ != null || sourceTable_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -1209,11 +1222,11 @@ public Builder setSourceTable(com.google.bigtable.admin.v2.Table value) { throw new NullPointerException(); } sourceTable_ = value; - onChanged(); } else { sourceTableBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1228,11 +1241,11 @@ public Builder setSourceTable(com.google.bigtable.admin.v2.Table value) { public Builder setSourceTable(com.google.bigtable.admin.v2.Table.Builder builderForValue) { if (sourceTableBuilder_ == null) { sourceTable_ = builderForValue.build(); - onChanged(); } else { sourceTableBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1246,19 +1259,18 @@ public Builder setSourceTable(com.google.bigtable.admin.v2.Table.Builder builder */ public Builder mergeSourceTable(com.google.bigtable.admin.v2.Table value) { if (sourceTableBuilder_ == null) { - if (sourceTable_ != null) { - sourceTable_ = - com.google.bigtable.admin.v2.Table.newBuilder(sourceTable_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && sourceTable_ != null + && sourceTable_ != com.google.bigtable.admin.v2.Table.getDefaultInstance()) { + getSourceTableBuilder().mergeFrom(value); } else { sourceTable_ = value; } - onChanged(); } else { sourceTableBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1271,14 +1283,13 @@ public Builder mergeSourceTable(com.google.bigtable.admin.v2.Table value) { * .google.bigtable.admin.v2.Table source_table = 2; */ public Builder clearSourceTable() { - if (sourceTableBuilder_ == null) { - sourceTable_ = null; - onChanged(); - } else { - sourceTable_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + sourceTable_ = null; + if (sourceTableBuilder_ != null) { + sourceTableBuilder_.dispose(); sourceTableBuilder_ = null; } - + onChanged(); return this; } /** @@ -1291,7 +1302,7 @@ public Builder clearSourceTable() { * .google.bigtable.admin.v2.Table source_table = 2; */ public com.google.bigtable.admin.v2.Table.Builder getSourceTableBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getSourceTableFieldBuilder().getBuilder(); } @@ -1376,6 +1387,7 @@ public long getDataSizeBytes() { public Builder setDataSizeBytes(long value) { dataSizeBytes_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1394,7 +1406,7 @@ public Builder setDataSizeBytes(long value) { * @return This builder for chaining. */ public Builder clearDataSizeBytes() { - + bitField0_ = (bitField0_ & ~0x00000004); dataSizeBytes_ = 0L; onChanged(); return this; @@ -1418,7 +1430,7 @@ public Builder clearDataSizeBytes() { * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1455,11 +1467,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1474,11 +1486,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1492,17 +1504,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1515,14 +1528,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp create_time = 4; */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1535,7 +1547,7 @@ public Builder clearCreateTime() { * .google.protobuf.Timestamp create_time = 4; */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } @@ -1603,7 +1615,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * @return Whether the deleteTime field is set. */ public boolean hasDeleteTime() { - return deleteTimeBuilder_ != null || deleteTime_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -1644,11 +1656,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } deleteTime_ = value; - onChanged(); } else { deleteTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1665,11 +1677,11 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp value) { public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (deleteTimeBuilder_ == null) { deleteTime_ = builderForValue.build(); - onChanged(); } else { deleteTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1685,17 +1697,18 @@ public Builder setDeleteTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) { if (deleteTimeBuilder_ == null) { - if (deleteTime_ != null) { - deleteTime_ = - com.google.protobuf.Timestamp.newBuilder(deleteTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && deleteTime_ != null + && deleteTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getDeleteTimeBuilder().mergeFrom(value); } else { deleteTime_ = value; } - onChanged(); } else { deleteTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1710,14 +1723,13 @@ public Builder mergeDeleteTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp delete_time = 5; */ public Builder clearDeleteTime() { - if (deleteTimeBuilder_ == null) { - deleteTime_ = null; - onChanged(); - } else { - deleteTime_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + deleteTime_ = null; + if (deleteTimeBuilder_ != null) { + deleteTimeBuilder_.dispose(); deleteTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1732,7 +1744,7 @@ public Builder clearDeleteTime() { * .google.protobuf.Timestamp delete_time = 5; */ public com.google.protobuf.Timestamp.Builder getDeleteTimeBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getDeleteTimeFieldBuilder().getBuilder(); } @@ -1813,8 +1825,8 @@ public int getStateValue() { * @return This builder for chaining. */ public Builder setStateValue(int value) { - state_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -1831,9 +1843,8 @@ public Builder setStateValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.Snapshot.State getState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Snapshot.State result = - com.google.bigtable.admin.v2.Snapshot.State.valueOf(state_); + com.google.bigtable.admin.v2.Snapshot.State.forNumber(state_); return result == null ? com.google.bigtable.admin.v2.Snapshot.State.UNRECOGNIZED : result; } /** @@ -1852,7 +1863,7 @@ public Builder setState(com.google.bigtable.admin.v2.Snapshot.State value) { if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000020; state_ = value.getNumber(); onChanged(); return this; @@ -1869,7 +1880,7 @@ public Builder setState(com.google.bigtable.admin.v2.Snapshot.State value) { * @return This builder for chaining. */ public Builder clearState() { - + bitField0_ = (bitField0_ & ~0x00000020); state_ = 0; onChanged(); return this; @@ -1936,8 +1947,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -1953,8 +1964,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000040); onChanged(); return this; } @@ -1975,8 +1986,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java index a789b41783..eb1da5a43c 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java @@ -114,7 +114,9 @@ public com.google.bigtable.admin.v2.SnapshotTableRequest getOriginalRequest() { */ @java.lang.Override public com.google.bigtable.admin.v2.SnapshotTableRequestOrBuilder getOriginalRequestOrBuilder() { - return getOriginalRequest(); + return originalRequest_ == null + ? com.google.bigtable.admin.v2.SnapshotTableRequest.getDefaultInstance() + : originalRequest_; } public static final int REQUEST_TIME_FIELD_NUMBER = 2; @@ -160,7 +162,7 @@ public com.google.protobuf.Timestamp getRequestTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { - return getRequestTime(); + return requestTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : requestTime_; } public static final int FINISH_TIME_FIELD_NUMBER = 3; @@ -206,7 +208,7 @@ public com.google.protobuf.Timestamp getFinishTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() { - return getFinishTime(); + return finishTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : finishTime_; } private byte memoizedIsInitialized = -1; @@ -443,22 +445,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - } else { - originalRequest_ = null; + bitField0_ = 0; + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - if (requestTimeBuilder_ == null) { - requestTime_ = null; - } else { - requestTime_ = null; + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - if (finishTimeBuilder_ == null) { - finishTime_ = null; - } else { - finishTime_ = null; + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } return this; @@ -488,25 +488,28 @@ public com.google.bigtable.admin.v2.SnapshotTableMetadata build() { public com.google.bigtable.admin.v2.SnapshotTableMetadata buildPartial() { com.google.bigtable.admin.v2.SnapshotTableMetadata result = new com.google.bigtable.admin.v2.SnapshotTableMetadata(this); - if (originalRequestBuilder_ == null) { - result.originalRequest_ = originalRequest_; - } else { - result.originalRequest_ = originalRequestBuilder_.build(); - } - if (requestTimeBuilder_ == null) { - result.requestTime_ = requestTime_; - } else { - result.requestTime_ = requestTimeBuilder_.build(); - } - if (finishTimeBuilder_ == null) { - result.finishTime_ = finishTime_; - } else { - result.finishTime_ = finishTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.SnapshotTableMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.originalRequest_ = + originalRequestBuilder_ == null ? originalRequest_ : originalRequestBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.requestTime_ = + requestTimeBuilder_ == null ? requestTime_ : requestTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.finishTime_ = finishTimeBuilder_ == null ? finishTime_ : finishTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -591,19 +594,19 @@ public Builder mergeFrom( case 10: { input.readMessage(getOriginalRequestFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getRequestTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getFinishTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -623,6 +626,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.SnapshotTableRequest originalRequest_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.SnapshotTableRequest, @@ -641,7 +646,7 @@ public Builder mergeFrom( * @return Whether the originalRequest field is set. */ public boolean hasOriginalRequest() { - return originalRequestBuilder_ != null || originalRequest_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -678,11 +683,11 @@ public Builder setOriginalRequest(com.google.bigtable.admin.v2.SnapshotTableRequ throw new NullPointerException(); } originalRequest_ = value; - onChanged(); } else { originalRequestBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -698,11 +703,11 @@ public Builder setOriginalRequest( com.google.bigtable.admin.v2.SnapshotTableRequest.Builder builderForValue) { if (originalRequestBuilder_ == null) { originalRequest_ = builderForValue.build(); - onChanged(); } else { originalRequestBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -716,19 +721,19 @@ public Builder setOriginalRequest( */ public Builder mergeOriginalRequest(com.google.bigtable.admin.v2.SnapshotTableRequest value) { if (originalRequestBuilder_ == null) { - if (originalRequest_ != null) { - originalRequest_ = - com.google.bigtable.admin.v2.SnapshotTableRequest.newBuilder(originalRequest_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && originalRequest_ != null + && originalRequest_ + != com.google.bigtable.admin.v2.SnapshotTableRequest.getDefaultInstance()) { + getOriginalRequestBuilder().mergeFrom(value); } else { originalRequest_ = value; } - onChanged(); } else { originalRequestBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -741,14 +746,13 @@ public Builder mergeOriginalRequest(com.google.bigtable.admin.v2.SnapshotTableRe * .google.bigtable.admin.v2.SnapshotTableRequest original_request = 1; */ public Builder clearOriginalRequest() { - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - onChanged(); - } else { - originalRequest_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - + onChanged(); return this; } /** @@ -761,7 +765,7 @@ public Builder clearOriginalRequest() { * .google.bigtable.admin.v2.SnapshotTableRequest original_request = 1; */ public com.google.bigtable.admin.v2.SnapshotTableRequest.Builder getOriginalRequestBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getOriginalRequestFieldBuilder().getBuilder(); } @@ -828,7 +832,7 @@ public com.google.bigtable.admin.v2.SnapshotTableRequest.Builder getOriginalRequ * @return Whether the requestTime field is set. */ public boolean hasRequestTime() { - return requestTimeBuilder_ != null || requestTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -865,11 +869,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } requestTime_ = value; - onChanged(); } else { requestTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -884,11 +888,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (requestTimeBuilder_ == null) { requestTime_ = builderForValue.build(); - onChanged(); } else { requestTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -902,19 +906,18 @@ public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForVa */ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { if (requestTimeBuilder_ == null) { - if (requestTime_ != null) { - requestTime_ = - com.google.protobuf.Timestamp.newBuilder(requestTime_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && requestTime_ != null + && requestTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getRequestTimeBuilder().mergeFrom(value); } else { requestTime_ = value; } - onChanged(); } else { requestTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -927,14 +930,13 @@ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp request_time = 2; */ public Builder clearRequestTime() { - if (requestTimeBuilder_ == null) { - requestTime_ = null; - onChanged(); - } else { - requestTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -947,7 +949,7 @@ public Builder clearRequestTime() { * .google.protobuf.Timestamp request_time = 2; */ public com.google.protobuf.Timestamp.Builder getRequestTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRequestTimeFieldBuilder().getBuilder(); } @@ -1013,7 +1015,7 @@ public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { * @return Whether the finishTime field is set. */ public boolean hasFinishTime() { - return finishTimeBuilder_ != null || finishTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1050,11 +1052,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } finishTime_ = value; - onChanged(); } else { finishTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1069,11 +1071,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (finishTimeBuilder_ == null) { finishTime_ = builderForValue.build(); - onChanged(); } else { finishTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1087,17 +1089,18 @@ public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { if (finishTimeBuilder_ == null) { - if (finishTime_ != null) { - finishTime_ = - com.google.protobuf.Timestamp.newBuilder(finishTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && finishTime_ != null + && finishTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getFinishTimeBuilder().mergeFrom(value); } else { finishTime_ = value; } - onChanged(); } else { finishTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1110,14 +1113,13 @@ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp finish_time = 3; */ public Builder clearFinishTime() { - if (finishTimeBuilder_ == null) { - finishTime_ = null; - onChanged(); - } else { - finishTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1130,7 +1132,7 @@ public Builder clearFinishTime() { * .google.protobuf.Timestamp finish_time = 3; */ public com.google.protobuf.Timestamp.Builder getFinishTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getFinishTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java index e759062c78..4fe5f1e474 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java @@ -76,7 +76,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -133,7 +135,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int CLUSTER_FIELD_NUMBER = 2; - private volatile java.lang.Object cluster_; + + @SuppressWarnings("serial") + private volatile java.lang.Object cluster_ = ""; /** * * @@ -190,7 +194,9 @@ public com.google.protobuf.ByteString getClusterBytes() { } public static final int SNAPSHOT_ID_FIELD_NUMBER = 3; - private volatile java.lang.Object snapshotId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object snapshotId_ = ""; /** * * @@ -296,11 +302,13 @@ public com.google.protobuf.Duration getTtl() { */ @java.lang.Override public com.google.protobuf.DurationOrBuilder getTtlOrBuilder() { - return getTtl(); + return ttl_ == null ? com.google.protobuf.Duration.getDefaultInstance() : ttl_; } public static final int DESCRIPTION_FIELD_NUMBER = 5; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -591,20 +599,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - cluster_ = ""; - snapshotId_ = ""; - - if (ttlBuilder_ == null) { - ttl_ = null; - } else { - ttl_ = null; + ttl_ = null; + if (ttlBuilder_ != null) { + ttlBuilder_.dispose(); ttlBuilder_ = null; } description_ = ""; - return this; } @@ -632,19 +636,32 @@ public com.google.bigtable.admin.v2.SnapshotTableRequest build() { public com.google.bigtable.admin.v2.SnapshotTableRequest buildPartial() { com.google.bigtable.admin.v2.SnapshotTableRequest result = new com.google.bigtable.admin.v2.SnapshotTableRequest(this); - result.name_ = name_; - result.cluster_ = cluster_; - result.snapshotId_ = snapshotId_; - if (ttlBuilder_ == null) { - result.ttl_ = ttl_; - } else { - result.ttl_ = ttlBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.description_ = description_; onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.SnapshotTableRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.cluster_ = cluster_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.snapshotId_ = snapshotId_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.ttl_ = ttlBuilder_ == null ? ttl_ : ttlBuilder_.build(); + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.description_ = description_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -693,14 +710,17 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.SnapshotTableRequest other return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getCluster().isEmpty()) { cluster_ = other.cluster_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getSnapshotId().isEmpty()) { snapshotId_ = other.snapshotId_; + bitField0_ |= 0x00000004; onChanged(); } if (other.hasTtl()) { @@ -708,6 +728,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.SnapshotTableRequest other } if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000010; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -739,31 +760,31 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { cluster_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { snapshotId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { input.readMessage(getTtlFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 34 case 42: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000010; break; } // case 42 default: @@ -783,6 +804,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -856,8 +879,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -877,8 +900,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -903,8 +926,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -982,8 +1005,8 @@ public Builder setCluster(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - cluster_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1003,8 +1026,8 @@ public Builder setCluster(java.lang.String value) { * @return This builder for chaining. */ public Builder clearCluster() { - cluster_ = getDefaultInstance().getCluster(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1029,8 +1052,8 @@ public Builder setClusterBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - cluster_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1105,8 +1128,8 @@ public Builder setSnapshotId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - snapshotId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1125,8 +1148,8 @@ public Builder setSnapshotId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSnapshotId() { - snapshotId_ = getDefaultInstance().getSnapshotId(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1150,8 +1173,8 @@ public Builder setSnapshotIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - snapshotId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1177,7 +1200,7 @@ public Builder setSnapshotIdBytes(com.google.protobuf.ByteString value) { * @return Whether the ttl field is set. */ public boolean hasTtl() { - return ttlBuilder_ != null || ttl_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1218,11 +1241,11 @@ public Builder setTtl(com.google.protobuf.Duration value) { throw new NullPointerException(); } ttl_ = value; - onChanged(); } else { ttlBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1240,11 +1263,11 @@ public Builder setTtl(com.google.protobuf.Duration value) { public Builder setTtl(com.google.protobuf.Duration.Builder builderForValue) { if (ttlBuilder_ == null) { ttl_ = builderForValue.build(); - onChanged(); } else { ttlBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1261,16 +1284,18 @@ public Builder setTtl(com.google.protobuf.Duration.Builder builderForValue) { */ public Builder mergeTtl(com.google.protobuf.Duration value) { if (ttlBuilder_ == null) { - if (ttl_ != null) { - ttl_ = com.google.protobuf.Duration.newBuilder(ttl_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && ttl_ != null + && ttl_ != com.google.protobuf.Duration.getDefaultInstance()) { + getTtlBuilder().mergeFrom(value); } else { ttl_ = value; } - onChanged(); } else { ttlBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1286,14 +1311,13 @@ public Builder mergeTtl(com.google.protobuf.Duration value) { * .google.protobuf.Duration ttl = 4; */ public Builder clearTtl() { - if (ttlBuilder_ == null) { - ttl_ = null; - onChanged(); - } else { - ttl_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + ttl_ = null; + if (ttlBuilder_ != null) { + ttlBuilder_.dispose(); ttlBuilder_ = null; } - + onChanged(); return this; } /** @@ -1309,7 +1333,7 @@ public Builder clearTtl() { * .google.protobuf.Duration ttl = 4; */ public com.google.protobuf.Duration.Builder getTtlBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getTtlFieldBuilder().getBuilder(); } @@ -1421,8 +1445,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1438,8 +1462,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -1460,8 +1484,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java index 654ce87398..0a6c4d24ca 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java @@ -859,7 +859,7 @@ private ReplicationState(int value) { } public static final int REPLICATION_STATE_FIELD_NUMBER = 1; - private int replicationState_; + private int replicationState_ = 0; /** * * @@ -892,9 +892,8 @@ public int getReplicationStateValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState getReplicationState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState result = - com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState.valueOf( + com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState.forNumber( replicationState_); return result == null ? com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState.UNRECOGNIZED @@ -902,6 +901,8 @@ public com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState getRepli } public static final int ENCRYPTION_INFO_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List encryptionInfo_; /** * @@ -1215,15 +1216,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; replicationState_ = 0; - if (encryptionInfoBuilder_ == null) { encryptionInfo_ = java.util.Collections.emptyList(); } else { encryptionInfo_ = null; encryptionInfoBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -1251,19 +1252,32 @@ public com.google.bigtable.admin.v2.Table.ClusterState build() { public com.google.bigtable.admin.v2.Table.ClusterState buildPartial() { com.google.bigtable.admin.v2.Table.ClusterState result = new com.google.bigtable.admin.v2.Table.ClusterState(this); - int from_bitField0_ = bitField0_; - result.replicationState_ = replicationState_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.admin.v2.Table.ClusterState result) { if (encryptionInfoBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { encryptionInfo_ = java.util.Collections.unmodifiableList(encryptionInfo_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.encryptionInfo_ = encryptionInfo_; } else { result.encryptionInfo_ = encryptionInfoBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.admin.v2.Table.ClusterState result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.replicationState_ = replicationState_; + } } @java.lang.Override @@ -1321,7 +1335,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Table.ClusterState other) if (!other.encryptionInfo_.isEmpty()) { if (encryptionInfo_.isEmpty()) { encryptionInfo_ = other.encryptionInfo_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureEncryptionInfoIsMutable(); encryptionInfo_.addAll(other.encryptionInfo_); @@ -1334,7 +1348,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Table.ClusterState other) encryptionInfoBuilder_.dispose(); encryptionInfoBuilder_ = null; encryptionInfo_ = other.encryptionInfo_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); encryptionInfoBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getEncryptionInfoFieldBuilder() @@ -1373,7 +1387,7 @@ public Builder mergeFrom( case 8: { replicationState_ = input.readEnum(); - + bitField0_ |= 0x00000001; break; } // case 8 case 18: @@ -1441,8 +1455,8 @@ public int getReplicationStateValue() { * @return This builder for chaining. */ public Builder setReplicationStateValue(int value) { - replicationState_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1462,9 +1476,8 @@ public Builder setReplicationStateValue(int value) { @java.lang.Override public com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState getReplicationState() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState result = - com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState.valueOf( + com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState.forNumber( replicationState_); return result == null ? com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState.UNRECOGNIZED @@ -1489,7 +1502,7 @@ public Builder setReplicationState( if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; replicationState_ = value.getNumber(); onChanged(); return this; @@ -1508,7 +1521,7 @@ public Builder setReplicationState( * @return This builder for chaining. */ public Builder clearReplicationState() { - + bitField0_ = (bitField0_ & ~0x00000001); replicationState_ = 0; onChanged(); return this; @@ -1518,10 +1531,10 @@ public Builder clearReplicationState() { java.util.Collections.emptyList(); private void ensureEncryptionInfoIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { encryptionInfo_ = new java.util.ArrayList(encryptionInfo_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -1805,7 +1818,7 @@ public Builder addAllEncryptionInfo( public Builder clearEncryptionInfo() { if (encryptionInfoBuilder_ == null) { encryptionInfo_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { encryptionInfoBuilder_.clear(); @@ -1973,7 +1986,7 @@ public com.google.bigtable.admin.v2.EncryptionInfo.Builder addEncryptionInfoBuil com.google.bigtable.admin.v2.EncryptionInfo.Builder, com.google.bigtable.admin.v2.EncryptionInfoOrBuilder>( encryptionInfo_, - ((bitField0_ & 0x00000001) != 0), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); encryptionInfo_ = null; @@ -2046,7 +2059,9 @@ public com.google.bigtable.admin.v2.Table.ClusterState getDefaultInstanceForType } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -2115,6 +2130,7 @@ private static final class ClusterStatesDefaultEntryHolder { com.google.bigtable.admin.v2.Table.ClusterState.getDefaultInstance()); } + @SuppressWarnings("serial") private com.google.protobuf.MapField< java.lang.String, com.google.bigtable.admin.v2.Table.ClusterState> clusterStates_; @@ -2197,8 +2213,10 @@ public boolean containsClusterStates(java.lang.String key) { * */ @java.lang.Override - public com.google.bigtable.admin.v2.Table.ClusterState getClusterStatesOrDefault( - java.lang.String key, com.google.bigtable.admin.v2.Table.ClusterState defaultValue) { + public /* nullable */ com.google.bigtable.admin.v2.Table.ClusterState getClusterStatesOrDefault( + java.lang.String key, + /* nullable */ + com.google.bigtable.admin.v2.Table.ClusterState defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -2251,6 +2269,7 @@ private static final class ColumnFamiliesDefaultEntryHolder { com.google.bigtable.admin.v2.ColumnFamily.getDefaultInstance()); } + @SuppressWarnings("serial") private com.google.protobuf.MapField columnFamilies_; @@ -2316,8 +2335,10 @@ public boolean containsColumnFamilies(java.lang.String key) { * map<string, .google.bigtable.admin.v2.ColumnFamily> column_families = 3; */ @java.lang.Override - public com.google.bigtable.admin.v2.ColumnFamily getColumnFamiliesOrDefault( - java.lang.String key, com.google.bigtable.admin.v2.ColumnFamily defaultValue) { + public /* nullable */ com.google.bigtable.admin.v2.ColumnFamily getColumnFamiliesOrDefault( + java.lang.String key, + /* nullable */ + com.google.bigtable.admin.v2.ColumnFamily defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -2349,7 +2370,7 @@ public com.google.bigtable.admin.v2.ColumnFamily getColumnFamiliesOrThrow(java.l } public static final int GRANULARITY_FIELD_NUMBER = 4; - private int granularity_; + private int granularity_ = 0; /** * * @@ -2388,9 +2409,8 @@ public int getGranularityValue() { */ @java.lang.Override public com.google.bigtable.admin.v2.Table.TimestampGranularity getGranularity() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Table.TimestampGranularity result = - com.google.bigtable.admin.v2.Table.TimestampGranularity.valueOf(granularity_); + com.google.bigtable.admin.v2.Table.TimestampGranularity.forNumber(granularity_); return result == null ? com.google.bigtable.admin.v2.Table.TimestampGranularity.UNRECOGNIZED : result; @@ -2450,11 +2470,13 @@ public com.google.bigtable.admin.v2.RestoreInfo getRestoreInfo() { */ @java.lang.Override public com.google.bigtable.admin.v2.RestoreInfoOrBuilder getRestoreInfoOrBuilder() { - return getRestoreInfo(); + return restoreInfo_ == null + ? com.google.bigtable.admin.v2.RestoreInfo.getDefaultInstance() + : restoreInfo_; } public static final int DELETION_PROTECTION_FIELD_NUMBER = 9; - private boolean deletionProtection_; + private boolean deletionProtection_ = false; /** * * @@ -2769,20 +2791,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - internalGetMutableClusterStates().clear(); internalGetMutableColumnFamilies().clear(); granularity_ = 0; - - if (restoreInfoBuilder_ == null) { - restoreInfo_ = null; - } else { - restoreInfo_ = null; + restoreInfo_ = null; + if (restoreInfoBuilder_ != null) { + restoreInfoBuilder_.dispose(); restoreInfoBuilder_ = null; } deletionProtection_ = false; - return this; } @@ -2809,23 +2828,38 @@ public com.google.bigtable.admin.v2.Table build() { @java.lang.Override public com.google.bigtable.admin.v2.Table buildPartial() { com.google.bigtable.admin.v2.Table result = new com.google.bigtable.admin.v2.Table(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; - result.clusterStates_ = internalGetClusterStates(); - result.clusterStates_.makeImmutable(); - result.columnFamilies_ = internalGetColumnFamilies(); - result.columnFamilies_.makeImmutable(); - result.granularity_ = granularity_; - if (restoreInfoBuilder_ == null) { - result.restoreInfo_ = restoreInfo_; - } else { - result.restoreInfo_ = restoreInfoBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.deletionProtection_ = deletionProtection_; onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.Table result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.clusterStates_ = internalGetClusterStates(); + result.clusterStates_.makeImmutable(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.columnFamilies_ = internalGetColumnFamilies(); + result.columnFamilies_.makeImmutable(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.granularity_ = granularity_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.restoreInfo_ = + restoreInfoBuilder_ == null ? restoreInfo_ : restoreInfoBuilder_.build(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.deletionProtection_ = deletionProtection_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -2873,10 +2907,13 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Table other) { if (other == com.google.bigtable.admin.v2.Table.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } internalGetMutableClusterStates().mergeFrom(other.internalGetClusterStates()); + bitField0_ |= 0x00000002; internalGetMutableColumnFamilies().mergeFrom(other.internalGetColumnFamilies()); + bitField0_ |= 0x00000004; if (other.granularity_ != 0) { setGranularityValue(other.getGranularityValue()); } @@ -2915,7 +2952,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -2929,6 +2966,7 @@ public Builder mergeFrom( internalGetMutableClusterStates() .getMutableMap() .put(clusterStates__.getKey(), clusterStates__.getValue()); + bitField0_ |= 0x00000002; break; } // case 18 case 26: @@ -2942,24 +2980,25 @@ public Builder mergeFrom( internalGetMutableColumnFamilies() .getMutableMap() .put(columnFamilies__.getKey(), columnFamilies__.getValue()); + bitField0_ |= 0x00000004; break; } // case 26 case 32: { granularity_ = input.readEnum(); - + bitField0_ |= 0x00000008; break; } // case 32 case 50: { input.readMessage(getRestoreInfoFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 50 case 72: { deletionProtection_ = input.readBool(); - + bitField0_ |= 0x00000020; break; } // case 72 default: @@ -3048,8 +3087,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3067,8 +3106,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -3091,8 +3130,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3114,8 +3153,6 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { private com.google.protobuf.MapField< java.lang.String, com.google.bigtable.admin.v2.Table.ClusterState> internalGetMutableClusterStates() { - onChanged(); - ; if (clusterStates_ == null) { clusterStates_ = com.google.protobuf.MapField.newMapField(ClusterStatesDefaultEntryHolder.defaultEntry); @@ -3123,6 +3160,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { if (!clusterStates_.isMutable()) { clusterStates_ = clusterStates_.copy(); } + bitField0_ |= 0x00000002; + onChanged(); return clusterStates_; } @@ -3194,8 +3233,10 @@ public boolean containsClusterStates(java.lang.String key) { * */ @java.lang.Override - public com.google.bigtable.admin.v2.Table.ClusterState getClusterStatesOrDefault( - java.lang.String key, com.google.bigtable.admin.v2.Table.ClusterState defaultValue) { + public /* nullable */ com.google.bigtable.admin.v2.Table.ClusterState getClusterStatesOrDefault( + java.lang.String key, + /* nullable */ + com.google.bigtable.admin.v2.Table.ClusterState defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -3233,6 +3274,7 @@ public com.google.bigtable.admin.v2.Table.ClusterState getClusterStatesOrThrow( } public Builder clearClusterStates() { + bitField0_ = (bitField0_ & ~0x00000002); internalGetMutableClusterStates().getMutableMap().clear(); return this; } @@ -3262,6 +3304,7 @@ public Builder removeClusterStates(java.lang.String key) { @java.lang.Deprecated public java.util.Map getMutableClusterStates() { + bitField0_ |= 0x00000002; return internalGetMutableClusterStates().getMutableMap(); } /** @@ -3287,8 +3330,8 @@ public Builder putClusterStates( if (value == null) { throw new NullPointerException("map value"); } - internalGetMutableClusterStates().getMutableMap().put(key, value); + bitField0_ |= 0x00000002; return this; } /** @@ -3309,6 +3352,7 @@ public Builder putClusterStates( public Builder putAllClusterStates( java.util.Map values) { internalGetMutableClusterStates().getMutableMap().putAll(values); + bitField0_ |= 0x00000002; return this; } @@ -3329,8 +3373,6 @@ public Builder putAllClusterStates( private com.google.protobuf.MapField< java.lang.String, com.google.bigtable.admin.v2.ColumnFamily> internalGetMutableColumnFamilies() { - onChanged(); - ; if (columnFamilies_ == null) { columnFamilies_ = com.google.protobuf.MapField.newMapField(ColumnFamiliesDefaultEntryHolder.defaultEntry); @@ -3338,6 +3380,8 @@ public Builder putAllClusterStates( if (!columnFamilies_.isMutable()) { columnFamilies_ = columnFamilies_.copy(); } + bitField0_ |= 0x00000004; + onChanged(); return columnFamilies_; } @@ -3394,8 +3438,10 @@ public boolean containsColumnFamilies(java.lang.String key) { * map<string, .google.bigtable.admin.v2.ColumnFamily> column_families = 3; */ @java.lang.Override - public com.google.bigtable.admin.v2.ColumnFamily getColumnFamiliesOrDefault( - java.lang.String key, com.google.bigtable.admin.v2.ColumnFamily defaultValue) { + public /* nullable */ com.google.bigtable.admin.v2.ColumnFamily getColumnFamiliesOrDefault( + java.lang.String key, + /* nullable */ + com.google.bigtable.admin.v2.ColumnFamily defaultValue) { if (key == null) { throw new NullPointerException("map key"); } @@ -3428,6 +3474,7 @@ public com.google.bigtable.admin.v2.ColumnFamily getColumnFamiliesOrThrow( } public Builder clearColumnFamilies() { + bitField0_ = (bitField0_ & ~0x00000004); internalGetMutableColumnFamilies().getMutableMap().clear(); return this; } @@ -3452,6 +3499,7 @@ public Builder removeColumnFamilies(java.lang.String key) { @java.lang.Deprecated public java.util.Map getMutableColumnFamilies() { + bitField0_ |= 0x00000004; return internalGetMutableColumnFamilies().getMutableMap(); } /** @@ -3472,8 +3520,8 @@ public Builder putColumnFamilies( if (value == null) { throw new NullPointerException("map value"); } - internalGetMutableColumnFamilies().getMutableMap().put(key, value); + bitField0_ |= 0x00000004; return this; } /** @@ -3489,6 +3537,7 @@ public Builder putColumnFamilies( public Builder putAllColumnFamilies( java.util.Map values) { internalGetMutableColumnFamilies().getMutableMap().putAll(values); + bitField0_ |= 0x00000004; return this; } @@ -3531,8 +3580,8 @@ public int getGranularityValue() { * @return This builder for chaining. */ public Builder setGranularityValue(int value) { - granularity_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -3554,9 +3603,8 @@ public Builder setGranularityValue(int value) { */ @java.lang.Override public com.google.bigtable.admin.v2.Table.TimestampGranularity getGranularity() { - @SuppressWarnings("deprecation") com.google.bigtable.admin.v2.Table.TimestampGranularity result = - com.google.bigtable.admin.v2.Table.TimestampGranularity.valueOf(granularity_); + com.google.bigtable.admin.v2.Table.TimestampGranularity.forNumber(granularity_); return result == null ? com.google.bigtable.admin.v2.Table.TimestampGranularity.UNRECOGNIZED : result; @@ -3582,7 +3630,7 @@ public Builder setGranularity(com.google.bigtable.admin.v2.Table.TimestampGranul if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000008; granularity_ = value.getNumber(); onChanged(); return this; @@ -3604,7 +3652,7 @@ public Builder setGranularity(com.google.bigtable.admin.v2.Table.TimestampGranul * @return This builder for chaining. */ public Builder clearGranularity() { - + bitField0_ = (bitField0_ & ~0x00000008); granularity_ = 0; onChanged(); return this; @@ -3631,7 +3679,7 @@ public Builder clearGranularity() { * @return Whether the restoreInfo field is set. */ public boolean hasRestoreInfo() { - return restoreInfoBuilder_ != null || restoreInfo_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -3674,11 +3722,11 @@ public Builder setRestoreInfo(com.google.bigtable.admin.v2.RestoreInfo value) { throw new NullPointerException(); } restoreInfo_ = value; - onChanged(); } else { restoreInfoBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -3697,11 +3745,11 @@ public Builder setRestoreInfo( com.google.bigtable.admin.v2.RestoreInfo.Builder builderForValue) { if (restoreInfoBuilder_ == null) { restoreInfo_ = builderForValue.build(); - onChanged(); } else { restoreInfoBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -3718,19 +3766,18 @@ public Builder setRestoreInfo( */ public Builder mergeRestoreInfo(com.google.bigtable.admin.v2.RestoreInfo value) { if (restoreInfoBuilder_ == null) { - if (restoreInfo_ != null) { - restoreInfo_ = - com.google.bigtable.admin.v2.RestoreInfo.newBuilder(restoreInfo_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && restoreInfo_ != null + && restoreInfo_ != com.google.bigtable.admin.v2.RestoreInfo.getDefaultInstance()) { + getRestoreInfoBuilder().mergeFrom(value); } else { restoreInfo_ = value; } - onChanged(); } else { restoreInfoBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -3746,14 +3793,13 @@ public Builder mergeRestoreInfo(com.google.bigtable.admin.v2.RestoreInfo value) * */ public Builder clearRestoreInfo() { - if (restoreInfoBuilder_ == null) { - restoreInfo_ = null; - onChanged(); - } else { - restoreInfo_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + restoreInfo_ = null; + if (restoreInfoBuilder_ != null) { + restoreInfoBuilder_.dispose(); restoreInfoBuilder_ = null; } - + onChanged(); return this; } /** @@ -3769,7 +3815,7 @@ public Builder clearRestoreInfo() { * */ public com.google.bigtable.admin.v2.RestoreInfo.Builder getRestoreInfoBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getRestoreInfoFieldBuilder().getBuilder(); } @@ -3864,6 +3910,7 @@ public boolean getDeletionProtection() { public Builder setDeletionProtection(boolean value) { deletionProtection_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -3884,7 +3931,7 @@ public Builder setDeletionProtection(boolean value) { * @return This builder for chaining. */ public Builder clearDeletionProtection() { - + bitField0_ = (bitField0_ & ~0x00000020); deletionProtection_ = false; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableOrBuilder.java index d27cc5d252..9b298d93fa 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableOrBuilder.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableOrBuilder.java @@ -120,7 +120,6 @@ public interface TableOrBuilder * map<string, .google.bigtable.admin.v2.Table.ClusterState> cluster_states = 2 [(.google.api.field_behavior) = OUTPUT_ONLY]; * */ - /* nullable */ com.google.bigtable.admin.v2.Table.ClusterState getClusterStatesOrDefault( java.lang.String key, @@ -189,7 +188,6 @@ com.google.bigtable.admin.v2.Table.ClusterState getClusterStatesOrDefault( * * map<string, .google.bigtable.admin.v2.ColumnFamily> column_families = 3; */ - /* nullable */ com.google.bigtable.admin.v2.ColumnFamily getColumnFamiliesOrDefault( java.lang.String key, diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UndeleteTableMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UndeleteTableMetadata.java index 383ba6159a..d605a5b138 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UndeleteTableMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UndeleteTableMetadata.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -160,7 +162,7 @@ public com.google.protobuf.Timestamp getStartTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { - return getStartTime(); + return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_; } public static final int END_TIME_FIELD_NUMBER = 3; @@ -206,7 +208,7 @@ public com.google.protobuf.Timestamp getEndTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { - return getEndTime(); + return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } private byte memoizedIsInitialized = -1; @@ -435,18 +437,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (startTimeBuilder_ == null) { - startTime_ = null; - } else { - startTime_ = null; + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - if (endTimeBuilder_ == null) { - endTime_ = null; - } else { - endTime_ = null; + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } return this; @@ -476,21 +476,26 @@ public com.google.bigtable.admin.v2.UndeleteTableMetadata build() { public com.google.bigtable.admin.v2.UndeleteTableMetadata buildPartial() { com.google.bigtable.admin.v2.UndeleteTableMetadata result = new com.google.bigtable.admin.v2.UndeleteTableMetadata(this); - result.name_ = name_; - if (startTimeBuilder_ == null) { - result.startTime_ = startTime_; - } else { - result.startTime_ = startTimeBuilder_.build(); - } - if (endTimeBuilder_ == null) { - result.endTime_ = endTime_; - } else { - result.endTime_ = endTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.UndeleteTableMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -539,6 +544,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.UndeleteTableMetadata othe return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasStartTime()) { @@ -576,19 +582,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -608,6 +614,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -669,8 +677,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -686,8 +694,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -708,8 +716,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -732,7 +740,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the startTime field is set. */ public boolean hasStartTime() { - return startTimeBuilder_ != null || startTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -767,11 +775,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } startTime_ = value; - onChanged(); } else { startTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -786,11 +794,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (startTimeBuilder_ == null) { startTime_ = builderForValue.build(); - onChanged(); } else { startTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -804,17 +812,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu */ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { if (startTimeBuilder_ == null) { - if (startTime_ != null) { - startTime_ = - com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && startTime_ != null + && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getStartTimeBuilder().mergeFrom(value); } else { startTime_ = value; } - onChanged(); } else { startTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -827,14 +836,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp start_time = 2; */ public Builder clearStartTime() { - if (startTimeBuilder_ == null) { - startTime_ = null; - onChanged(); - } else { - startTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -847,7 +855,7 @@ public Builder clearStartTime() { * .google.protobuf.Timestamp start_time = 2; */ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getStartTimeFieldBuilder().getBuilder(); } @@ -911,7 +919,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { * @return Whether the endTime field is set. */ public boolean hasEndTime() { - return endTimeBuilder_ != null || endTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -946,11 +954,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } endTime_ = value; - onChanged(); } else { endTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -965,11 +973,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (endTimeBuilder_ == null) { endTime_ = builderForValue.build(); - onChanged(); } else { endTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -983,17 +991,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) */ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { if (endTimeBuilder_ == null) { - if (endTime_ != null) { - endTime_ = - com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && endTime_ != null + && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getEndTimeBuilder().mergeFrom(value); } else { endTime_ = value; } - onChanged(); } else { endTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1006,14 +1015,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp end_time = 3; */ public Builder clearEndTime() { - if (endTimeBuilder_ == null) { - endTime_ = null; - onChanged(); - } else { - endTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1026,7 +1034,7 @@ public Builder clearEndTime() { * .google.protobuf.Timestamp end_time = 3; */ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getEndTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UndeleteTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UndeleteTableRequest.java index 1416ee41cd..cc459292d3 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UndeleteTableRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UndeleteTableRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -323,8 +325,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -352,11 +354,20 @@ public com.google.bigtable.admin.v2.UndeleteTableRequest build() { public com.google.bigtable.admin.v2.UndeleteTableRequest buildPartial() { com.google.bigtable.admin.v2.UndeleteTableRequest result = new com.google.bigtable.admin.v2.UndeleteTableRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.UndeleteTableRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -405,6 +416,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.UndeleteTableRequest other return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -436,7 +448,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -456,6 +468,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -529,8 +543,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -550,8 +564,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -576,8 +590,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java index 10c54caa1c..87f17a7a52 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java @@ -116,7 +116,9 @@ public com.google.bigtable.admin.v2.AppProfile getAppProfile() { */ @java.lang.Override public com.google.bigtable.admin.v2.AppProfileOrBuilder getAppProfileOrBuilder() { - return getAppProfile(); + return appProfile_ == null + ? com.google.bigtable.admin.v2.AppProfile.getDefaultInstance() + : appProfile_; } public static final int UPDATE_MASK_FIELD_NUMBER = 2; @@ -168,11 +170,11 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } public static final int IGNORE_WARNINGS_FIELD_NUMBER = 3; - private boolean ignoreWarnings_; + private boolean ignoreWarnings_ = false; /** * * @@ -414,20 +416,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (appProfileBuilder_ == null) { - appProfile_ = null; - } else { - appProfile_ = null; + bitField0_ = 0; + appProfile_ = null; + if (appProfileBuilder_ != null) { + appProfileBuilder_.dispose(); appProfileBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } ignoreWarnings_ = false; - return this; } @@ -455,21 +455,26 @@ public com.google.bigtable.admin.v2.UpdateAppProfileRequest build() { public com.google.bigtable.admin.v2.UpdateAppProfileRequest buildPartial() { com.google.bigtable.admin.v2.UpdateAppProfileRequest result = new com.google.bigtable.admin.v2.UpdateAppProfileRequest(this); - if (appProfileBuilder_ == null) { - result.appProfile_ = appProfile_; - } else { - result.appProfile_ = appProfileBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); - } - result.ignoreWarnings_ = ignoreWarnings_; onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.UpdateAppProfileRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.appProfile_ = appProfileBuilder_ == null ? appProfile_ : appProfileBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.ignoreWarnings_ = ignoreWarnings_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -554,19 +559,19 @@ public Builder mergeFrom( case 10: { input.readMessage(getAppProfileFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { ignoreWarnings_ = input.readBool(); - + bitField0_ |= 0x00000004; break; } // case 24 default: @@ -586,6 +591,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.AppProfile appProfile_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.AppProfile, @@ -606,7 +613,7 @@ public Builder mergeFrom( * @return Whether the appProfile field is set. */ public boolean hasAppProfile() { - return appProfileBuilder_ != null || appProfile_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -647,11 +654,11 @@ public Builder setAppProfile(com.google.bigtable.admin.v2.AppProfile value) { throw new NullPointerException(); } appProfile_ = value; - onChanged(); } else { appProfileBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -668,11 +675,11 @@ public Builder setAppProfile(com.google.bigtable.admin.v2.AppProfile value) { public Builder setAppProfile(com.google.bigtable.admin.v2.AppProfile.Builder builderForValue) { if (appProfileBuilder_ == null) { appProfile_ = builderForValue.build(); - onChanged(); } else { appProfileBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -688,19 +695,18 @@ public Builder setAppProfile(com.google.bigtable.admin.v2.AppProfile.Builder bui */ public Builder mergeAppProfile(com.google.bigtable.admin.v2.AppProfile value) { if (appProfileBuilder_ == null) { - if (appProfile_ != null) { - appProfile_ = - com.google.bigtable.admin.v2.AppProfile.newBuilder(appProfile_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && appProfile_ != null + && appProfile_ != com.google.bigtable.admin.v2.AppProfile.getDefaultInstance()) { + getAppProfileBuilder().mergeFrom(value); } else { appProfile_ = value; } - onChanged(); } else { appProfileBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -715,14 +721,13 @@ public Builder mergeAppProfile(com.google.bigtable.admin.v2.AppProfile value) { * */ public Builder clearAppProfile() { - if (appProfileBuilder_ == null) { - appProfile_ = null; - onChanged(); - } else { - appProfile_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + appProfile_ = null; + if (appProfileBuilder_ != null) { + appProfileBuilder_.dispose(); appProfileBuilder_ = null; } - + onChanged(); return this; } /** @@ -737,7 +742,7 @@ public Builder clearAppProfile() { * */ public com.google.bigtable.admin.v2.AppProfile.Builder getAppProfileBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getAppProfileFieldBuilder().getBuilder(); } @@ -809,7 +814,7 @@ public com.google.bigtable.admin.v2.AppProfileOrBuilder getAppProfileOrBuilder() * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -850,11 +855,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -871,11 +876,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -891,17 +896,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -916,14 +922,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -938,7 +943,7 @@ public Builder clearUpdateMask() { * */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } @@ -1021,6 +1026,7 @@ public boolean getIgnoreWarnings() { public Builder setIgnoreWarnings(boolean value) { ignoreWarnings_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1036,7 +1042,7 @@ public Builder setIgnoreWarnings(boolean value) { * @return This builder for chaining. */ public Builder clearIgnoreWarnings() { - + bitField0_ = (bitField0_ & ~0x00000004); ignoreWarnings_ = false; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateBackupRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateBackupRequest.java index a4311ef7bc..b93cb23bf9 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateBackupRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateBackupRequest.java @@ -120,7 +120,7 @@ public com.google.bigtable.admin.v2.Backup getBackup() { */ @java.lang.Override public com.google.bigtable.admin.v2.BackupOrBuilder getBackupOrBuilder() { - return getBackup(); + return backup_ == null ? com.google.bigtable.admin.v2.Backup.getDefaultInstance() : backup_; } public static final int UPDATE_MASK_FIELD_NUMBER = 2; @@ -181,7 +181,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } private byte memoizedIsInitialized = -1; @@ -400,16 +400,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (backupBuilder_ == null) { - backup_ = null; - } else { - backup_ = null; + bitField0_ = 0; + backup_ = null; + if (backupBuilder_ != null) { + backupBuilder_.dispose(); backupBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } return this; @@ -439,20 +438,23 @@ public com.google.bigtable.admin.v2.UpdateBackupRequest build() { public com.google.bigtable.admin.v2.UpdateBackupRequest buildPartial() { com.google.bigtable.admin.v2.UpdateBackupRequest result = new com.google.bigtable.admin.v2.UpdateBackupRequest(this); - if (backupBuilder_ == null) { - result.backup_ = backup_; - } else { - result.backup_ = backupBuilder_.build(); - } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.UpdateBackupRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.backup_ = backupBuilder_ == null ? backup_ : backupBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -534,13 +536,13 @@ public Builder mergeFrom( case 10: { input.readMessage(getBackupFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -560,6 +562,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.Backup backup_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.Backup, @@ -582,7 +586,7 @@ public Builder mergeFrom( * @return Whether the backup field is set. */ public boolean hasBackup() { - return backupBuilder_ != null || backup_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -625,11 +629,11 @@ public Builder setBackup(com.google.bigtable.admin.v2.Backup value) { throw new NullPointerException(); } backup_ = value; - onChanged(); } else { backupBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -648,11 +652,11 @@ public Builder setBackup(com.google.bigtable.admin.v2.Backup value) { public Builder setBackup(com.google.bigtable.admin.v2.Backup.Builder builderForValue) { if (backupBuilder_ == null) { backup_ = builderForValue.build(); - onChanged(); } else { backupBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -670,19 +674,18 @@ public Builder setBackup(com.google.bigtable.admin.v2.Backup.Builder builderForV */ public Builder mergeBackup(com.google.bigtable.admin.v2.Backup value) { if (backupBuilder_ == null) { - if (backup_ != null) { - backup_ = - com.google.bigtable.admin.v2.Backup.newBuilder(backup_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && backup_ != null + && backup_ != com.google.bigtable.admin.v2.Backup.getDefaultInstance()) { + getBackupBuilder().mergeFrom(value); } else { backup_ = value; } - onChanged(); } else { backupBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -699,14 +702,13 @@ public Builder mergeBackup(com.google.bigtable.admin.v2.Backup value) { * */ public Builder clearBackup() { - if (backupBuilder_ == null) { - backup_ = null; - onChanged(); - } else { - backup_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + backup_ = null; + if (backupBuilder_ != null) { + backupBuilder_.dispose(); backupBuilder_ = null; } - + onChanged(); return this; } /** @@ -723,7 +725,7 @@ public Builder clearBackup() { * */ public com.google.bigtable.admin.v2.Backup.Builder getBackupBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getBackupFieldBuilder().getBuilder(); } @@ -800,7 +802,7 @@ public com.google.bigtable.admin.v2.BackupOrBuilder getBackupOrBuilder() { * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -847,11 +849,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -871,11 +873,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -894,17 +896,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -922,14 +925,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -947,7 +949,7 @@ public Builder clearUpdateMask() { * */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java index 87faae7b1c..89364f5b56 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java @@ -110,7 +110,9 @@ public com.google.bigtable.admin.v2.Cluster getOriginalRequest() { */ @java.lang.Override public com.google.bigtable.admin.v2.ClusterOrBuilder getOriginalRequestOrBuilder() { - return getOriginalRequest(); + return originalRequest_ == null + ? com.google.bigtable.admin.v2.Cluster.getDefaultInstance() + : originalRequest_; } public static final int REQUEST_TIME_FIELD_NUMBER = 2; @@ -156,7 +158,7 @@ public com.google.protobuf.Timestamp getRequestTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { - return getRequestTime(); + return requestTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : requestTime_; } public static final int FINISH_TIME_FIELD_NUMBER = 3; @@ -202,7 +204,7 @@ public com.google.protobuf.Timestamp getFinishTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() { - return getFinishTime(); + return finishTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : finishTime_; } private byte memoizedIsInitialized = -1; @@ -435,22 +437,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - } else { - originalRequest_ = null; + bitField0_ = 0; + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - if (requestTimeBuilder_ == null) { - requestTime_ = null; - } else { - requestTime_ = null; + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - if (finishTimeBuilder_ == null) { - finishTime_ = null; - } else { - finishTime_ = null; + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } return this; @@ -480,25 +480,28 @@ public com.google.bigtable.admin.v2.UpdateClusterMetadata build() { public com.google.bigtable.admin.v2.UpdateClusterMetadata buildPartial() { com.google.bigtable.admin.v2.UpdateClusterMetadata result = new com.google.bigtable.admin.v2.UpdateClusterMetadata(this); - if (originalRequestBuilder_ == null) { - result.originalRequest_ = originalRequest_; - } else { - result.originalRequest_ = originalRequestBuilder_.build(); - } - if (requestTimeBuilder_ == null) { - result.requestTime_ = requestTime_; - } else { - result.requestTime_ = requestTimeBuilder_.build(); - } - if (finishTimeBuilder_ == null) { - result.finishTime_ = finishTime_; - } else { - result.finishTime_ = finishTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.UpdateClusterMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.originalRequest_ = + originalRequestBuilder_ == null ? originalRequest_ : originalRequestBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.requestTime_ = + requestTimeBuilder_ == null ? requestTime_ : requestTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.finishTime_ = finishTimeBuilder_ == null ? finishTime_ : finishTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -583,19 +586,19 @@ public Builder mergeFrom( case 10: { input.readMessage(getOriginalRequestFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getRequestTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getFinishTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -615,6 +618,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.Cluster originalRequest_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.Cluster, @@ -633,7 +638,7 @@ public Builder mergeFrom( * @return Whether the originalRequest field is set. */ public boolean hasOriginalRequest() { - return originalRequestBuilder_ != null || originalRequest_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -670,11 +675,11 @@ public Builder setOriginalRequest(com.google.bigtable.admin.v2.Cluster value) { throw new NullPointerException(); } originalRequest_ = value; - onChanged(); } else { originalRequestBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -690,11 +695,11 @@ public Builder setOriginalRequest( com.google.bigtable.admin.v2.Cluster.Builder builderForValue) { if (originalRequestBuilder_ == null) { originalRequest_ = builderForValue.build(); - onChanged(); } else { originalRequestBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -708,19 +713,18 @@ public Builder setOriginalRequest( */ public Builder mergeOriginalRequest(com.google.bigtable.admin.v2.Cluster value) { if (originalRequestBuilder_ == null) { - if (originalRequest_ != null) { - originalRequest_ = - com.google.bigtable.admin.v2.Cluster.newBuilder(originalRequest_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && originalRequest_ != null + && originalRequest_ != com.google.bigtable.admin.v2.Cluster.getDefaultInstance()) { + getOriginalRequestBuilder().mergeFrom(value); } else { originalRequest_ = value; } - onChanged(); } else { originalRequestBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -733,14 +737,13 @@ public Builder mergeOriginalRequest(com.google.bigtable.admin.v2.Cluster value) * .google.bigtable.admin.v2.Cluster original_request = 1; */ public Builder clearOriginalRequest() { - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - onChanged(); - } else { - originalRequest_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - + onChanged(); return this; } /** @@ -753,7 +756,7 @@ public Builder clearOriginalRequest() { * .google.bigtable.admin.v2.Cluster original_request = 1; */ public com.google.bigtable.admin.v2.Cluster.Builder getOriginalRequestBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getOriginalRequestFieldBuilder().getBuilder(); } @@ -819,7 +822,7 @@ public com.google.bigtable.admin.v2.ClusterOrBuilder getOriginalRequestOrBuilder * @return Whether the requestTime field is set. */ public boolean hasRequestTime() { - return requestTimeBuilder_ != null || requestTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -856,11 +859,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } requestTime_ = value; - onChanged(); } else { requestTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -875,11 +878,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (requestTimeBuilder_ == null) { requestTime_ = builderForValue.build(); - onChanged(); } else { requestTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -893,19 +896,18 @@ public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForVa */ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { if (requestTimeBuilder_ == null) { - if (requestTime_ != null) { - requestTime_ = - com.google.protobuf.Timestamp.newBuilder(requestTime_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && requestTime_ != null + && requestTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getRequestTimeBuilder().mergeFrom(value); } else { requestTime_ = value; } - onChanged(); } else { requestTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -918,14 +920,13 @@ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp request_time = 2; */ public Builder clearRequestTime() { - if (requestTimeBuilder_ == null) { - requestTime_ = null; - onChanged(); - } else { - requestTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -938,7 +939,7 @@ public Builder clearRequestTime() { * .google.protobuf.Timestamp request_time = 2; */ public com.google.protobuf.Timestamp.Builder getRequestTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRequestTimeFieldBuilder().getBuilder(); } @@ -1004,7 +1005,7 @@ public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { * @return Whether the finishTime field is set. */ public boolean hasFinishTime() { - return finishTimeBuilder_ != null || finishTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1041,11 +1042,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } finishTime_ = value; - onChanged(); } else { finishTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1060,11 +1061,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (finishTimeBuilder_ == null) { finishTime_ = builderForValue.build(); - onChanged(); } else { finishTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1078,17 +1079,18 @@ public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { if (finishTimeBuilder_ == null) { - if (finishTime_ != null) { - finishTime_ = - com.google.protobuf.Timestamp.newBuilder(finishTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && finishTime_ != null + && finishTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getFinishTimeBuilder().mergeFrom(value); } else { finishTime_ = value; } - onChanged(); } else { finishTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1101,14 +1103,13 @@ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp finish_time = 3; */ public Builder clearFinishTime() { - if (finishTimeBuilder_ == null) { - finishTime_ = null; - onChanged(); - } else { - finishTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1121,7 +1122,7 @@ public Builder clearFinishTime() { * .google.protobuf.Timestamp finish_time = 3; */ public com.google.protobuf.Timestamp.Builder getFinishTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getFinishTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java index 462d1afca9..93e4059977 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java @@ -111,7 +111,9 @@ public com.google.bigtable.admin.v2.PartialUpdateInstanceRequest getOriginalRequ @java.lang.Override public com.google.bigtable.admin.v2.PartialUpdateInstanceRequestOrBuilder getOriginalRequestOrBuilder() { - return getOriginalRequest(); + return originalRequest_ == null + ? com.google.bigtable.admin.v2.PartialUpdateInstanceRequest.getDefaultInstance() + : originalRequest_; } public static final int REQUEST_TIME_FIELD_NUMBER = 2; @@ -157,7 +159,7 @@ public com.google.protobuf.Timestamp getRequestTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { - return getRequestTime(); + return requestTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : requestTime_; } public static final int FINISH_TIME_FIELD_NUMBER = 3; @@ -203,7 +205,7 @@ public com.google.protobuf.Timestamp getFinishTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() { - return getFinishTime(); + return finishTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : finishTime_; } private byte memoizedIsInitialized = -1; @@ -436,22 +438,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - } else { - originalRequest_ = null; + bitField0_ = 0; + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - if (requestTimeBuilder_ == null) { - requestTime_ = null; - } else { - requestTime_ = null; + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - if (finishTimeBuilder_ == null) { - finishTime_ = null; - } else { - finishTime_ = null; + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } return this; @@ -481,25 +481,28 @@ public com.google.bigtable.admin.v2.UpdateInstanceMetadata build() { public com.google.bigtable.admin.v2.UpdateInstanceMetadata buildPartial() { com.google.bigtable.admin.v2.UpdateInstanceMetadata result = new com.google.bigtable.admin.v2.UpdateInstanceMetadata(this); - if (originalRequestBuilder_ == null) { - result.originalRequest_ = originalRequest_; - } else { - result.originalRequest_ = originalRequestBuilder_.build(); - } - if (requestTimeBuilder_ == null) { - result.requestTime_ = requestTime_; - } else { - result.requestTime_ = requestTimeBuilder_.build(); - } - if (finishTimeBuilder_ == null) { - result.finishTime_ = finishTime_; - } else { - result.finishTime_ = finishTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.UpdateInstanceMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.originalRequest_ = + originalRequestBuilder_ == null ? originalRequest_ : originalRequestBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.requestTime_ = + requestTimeBuilder_ == null ? requestTime_ : requestTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.finishTime_ = finishTimeBuilder_ == null ? finishTime_ : finishTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -584,19 +587,19 @@ public Builder mergeFrom( case 10: { input.readMessage(getOriginalRequestFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getRequestTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getFinishTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -616,6 +619,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.PartialUpdateInstanceRequest originalRequest_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.PartialUpdateInstanceRequest, @@ -634,7 +639,7 @@ public Builder mergeFrom( * @return Whether the originalRequest field is set. */ public boolean hasOriginalRequest() { - return originalRequestBuilder_ != null || originalRequest_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -672,11 +677,11 @@ public Builder setOriginalRequest( throw new NullPointerException(); } originalRequest_ = value; - onChanged(); } else { originalRequestBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -692,11 +697,11 @@ public Builder setOriginalRequest( com.google.bigtable.admin.v2.PartialUpdateInstanceRequest.Builder builderForValue) { if (originalRequestBuilder_ == null) { originalRequest_ = builderForValue.build(); - onChanged(); } else { originalRequestBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -711,19 +716,19 @@ public Builder setOriginalRequest( public Builder mergeOriginalRequest( com.google.bigtable.admin.v2.PartialUpdateInstanceRequest value) { if (originalRequestBuilder_ == null) { - if (originalRequest_ != null) { - originalRequest_ = - com.google.bigtable.admin.v2.PartialUpdateInstanceRequest.newBuilder(originalRequest_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && originalRequest_ != null + && originalRequest_ + != com.google.bigtable.admin.v2.PartialUpdateInstanceRequest.getDefaultInstance()) { + getOriginalRequestBuilder().mergeFrom(value); } else { originalRequest_ = value; } - onChanged(); } else { originalRequestBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -736,14 +741,13 @@ public Builder mergeOriginalRequest( * .google.bigtable.admin.v2.PartialUpdateInstanceRequest original_request = 1; */ public Builder clearOriginalRequest() { - if (originalRequestBuilder_ == null) { - originalRequest_ = null; - onChanged(); - } else { - originalRequest_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + originalRequest_ = null; + if (originalRequestBuilder_ != null) { + originalRequestBuilder_.dispose(); originalRequestBuilder_ = null; } - + onChanged(); return this; } /** @@ -757,7 +761,7 @@ public Builder clearOriginalRequest() { */ public com.google.bigtable.admin.v2.PartialUpdateInstanceRequest.Builder getOriginalRequestBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getOriginalRequestFieldBuilder().getBuilder(); } @@ -824,7 +828,7 @@ public Builder clearOriginalRequest() { * @return Whether the requestTime field is set. */ public boolean hasRequestTime() { - return requestTimeBuilder_ != null || requestTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -861,11 +865,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } requestTime_ = value; - onChanged(); } else { requestTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -880,11 +884,11 @@ public Builder setRequestTime(com.google.protobuf.Timestamp value) { public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (requestTimeBuilder_ == null) { requestTime_ = builderForValue.build(); - onChanged(); } else { requestTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -898,19 +902,18 @@ public Builder setRequestTime(com.google.protobuf.Timestamp.Builder builderForVa */ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { if (requestTimeBuilder_ == null) { - if (requestTime_ != null) { - requestTime_ = - com.google.protobuf.Timestamp.newBuilder(requestTime_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && requestTime_ != null + && requestTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getRequestTimeBuilder().mergeFrom(value); } else { requestTime_ = value; } - onChanged(); } else { requestTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -923,14 +926,13 @@ public Builder mergeRequestTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp request_time = 2; */ public Builder clearRequestTime() { - if (requestTimeBuilder_ == null) { - requestTime_ = null; - onChanged(); - } else { - requestTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + requestTime_ = null; + if (requestTimeBuilder_ != null) { + requestTimeBuilder_.dispose(); requestTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -943,7 +945,7 @@ public Builder clearRequestTime() { * .google.protobuf.Timestamp request_time = 2; */ public com.google.protobuf.Timestamp.Builder getRequestTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRequestTimeFieldBuilder().getBuilder(); } @@ -1009,7 +1011,7 @@ public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { * @return Whether the finishTime field is set. */ public boolean hasFinishTime() { - return finishTimeBuilder_ != null || finishTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1046,11 +1048,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } finishTime_ = value; - onChanged(); } else { finishTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1065,11 +1067,11 @@ public Builder setFinishTime(com.google.protobuf.Timestamp value) { public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (finishTimeBuilder_ == null) { finishTime_ = builderForValue.build(); - onChanged(); } else { finishTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1083,17 +1085,18 @@ public Builder setFinishTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { if (finishTimeBuilder_ == null) { - if (finishTime_ != null) { - finishTime_ = - com.google.protobuf.Timestamp.newBuilder(finishTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && finishTime_ != null + && finishTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getFinishTimeBuilder().mergeFrom(value); } else { finishTime_ = value; } - onChanged(); } else { finishTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1106,14 +1109,13 @@ public Builder mergeFinishTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp finish_time = 3; */ public Builder clearFinishTime() { - if (finishTimeBuilder_ == null) { - finishTime_ = null; - onChanged(); - } else { - finishTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + finishTime_ = null; + if (finishTimeBuilder_ != null) { + finishTimeBuilder_.dispose(); finishTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1126,7 +1128,7 @@ public Builder clearFinishTime() { * .google.protobuf.Timestamp finish_time = 3; */ public com.google.protobuf.Timestamp.Builder getFinishTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getFinishTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateTableMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateTableMetadata.java index 8a951e94b0..8ba3fc72bd 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateTableMetadata.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateTableMetadata.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -160,7 +162,7 @@ public com.google.protobuf.Timestamp getStartTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { - return getStartTime(); + return startTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : startTime_; } public static final int END_TIME_FIELD_NUMBER = 3; @@ -206,7 +208,7 @@ public com.google.protobuf.Timestamp getEndTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { - return getEndTime(); + return endTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : endTime_; } private byte memoizedIsInitialized = -1; @@ -435,18 +437,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (startTimeBuilder_ == null) { - startTime_ = null; - } else { - startTime_ = null; + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - if (endTimeBuilder_ == null) { - endTime_ = null; - } else { - endTime_ = null; + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } return this; @@ -476,21 +476,26 @@ public com.google.bigtable.admin.v2.UpdateTableMetadata build() { public com.google.bigtable.admin.v2.UpdateTableMetadata buildPartial() { com.google.bigtable.admin.v2.UpdateTableMetadata result = new com.google.bigtable.admin.v2.UpdateTableMetadata(this); - result.name_ = name_; - if (startTimeBuilder_ == null) { - result.startTime_ = startTime_; - } else { - result.startTime_ = startTimeBuilder_.build(); - } - if (endTimeBuilder_ == null) { - result.endTime_ = endTime_; - } else { - result.endTime_ = endTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.UpdateTableMetadata result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -539,6 +544,7 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.UpdateTableMetadata other) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasStartTime()) { @@ -576,19 +582,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -608,6 +614,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -669,8 +677,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -686,8 +694,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -708,8 +716,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -732,7 +740,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the startTime field is set. */ public boolean hasStartTime() { - return startTimeBuilder_ != null || startTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -767,11 +775,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } startTime_ = value; - onChanged(); } else { startTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -786,11 +794,11 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) { public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (startTimeBuilder_ == null) { startTime_ = builderForValue.build(); - onChanged(); } else { startTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -804,17 +812,18 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu */ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { if (startTimeBuilder_ == null) { - if (startTime_ != null) { - startTime_ = - com.google.protobuf.Timestamp.newBuilder(startTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && startTime_ != null + && startTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getStartTimeBuilder().mergeFrom(value); } else { startTime_ = value; } - onChanged(); } else { startTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -827,14 +836,13 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp start_time = 2; */ public Builder clearStartTime() { - if (startTimeBuilder_ == null) { - startTime_ = null; - onChanged(); - } else { - startTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + startTime_ = null; + if (startTimeBuilder_ != null) { + startTimeBuilder_.dispose(); startTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -847,7 +855,7 @@ public Builder clearStartTime() { * .google.protobuf.Timestamp start_time = 2; */ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getStartTimeFieldBuilder().getBuilder(); } @@ -911,7 +919,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { * @return Whether the endTime field is set. */ public boolean hasEndTime() { - return endTimeBuilder_ != null || endTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -946,11 +954,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } endTime_ = value; - onChanged(); } else { endTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -965,11 +973,11 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (endTimeBuilder_ == null) { endTime_ = builderForValue.build(); - onChanged(); } else { endTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -983,17 +991,18 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) */ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { if (endTimeBuilder_ == null) { - if (endTime_ != null) { - endTime_ = - com.google.protobuf.Timestamp.newBuilder(endTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && endTime_ != null + && endTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getEndTimeBuilder().mergeFrom(value); } else { endTime_ = value; } - onChanged(); } else { endTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1006,14 +1015,13 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp end_time = 3; */ public Builder clearEndTime() { - if (endTimeBuilder_ == null) { - endTime_ = null; - onChanged(); - } else { - endTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + endTime_ = null; + if (endTimeBuilder_ != null) { + endTimeBuilder_.dispose(); endTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1026,7 +1034,7 @@ public Builder clearEndTime() { * .google.protobuf.Timestamp end_time = 3; */ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getEndTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateTableRequest.java index b3a21906de..d62b576c6c 100644 --- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateTableRequest.java +++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateTableRequest.java @@ -115,7 +115,7 @@ public com.google.bigtable.admin.v2.Table getTable() { */ @java.lang.Override public com.google.bigtable.admin.v2.TableOrBuilder getTableOrBuilder() { - return getTable(); + return table_ == null ? com.google.bigtable.admin.v2.Table.getDefaultInstance() : table_; } public static final int UPDATE_MASK_FIELD_NUMBER = 2; @@ -185,7 +185,7 @@ public com.google.protobuf.FieldMask getUpdateMask() { */ @java.lang.Override public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); + return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; } private byte memoizedIsInitialized = -1; @@ -405,16 +405,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (tableBuilder_ == null) { - table_ = null; - } else { - table_ = null; + bitField0_ = 0; + table_ = null; + if (tableBuilder_ != null) { + tableBuilder_.dispose(); tableBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } return this; @@ -444,20 +443,23 @@ public com.google.bigtable.admin.v2.UpdateTableRequest build() { public com.google.bigtable.admin.v2.UpdateTableRequest buildPartial() { com.google.bigtable.admin.v2.UpdateTableRequest result = new com.google.bigtable.admin.v2.UpdateTableRequest(this); - if (tableBuilder_ == null) { - result.table_ = table_; - } else { - result.table_ = tableBuilder_.build(); - } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.admin.v2.UpdateTableRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.table_ = tableBuilder_ == null ? table_ : tableBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.updateMask_ = updateMaskBuilder_ == null ? updateMask_ : updateMaskBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -539,13 +541,13 @@ public Builder mergeFrom( case 10: { input.readMessage(getTableFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getUpdateMaskFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -565,6 +567,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.admin.v2.Table table_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.Table, @@ -585,7 +589,7 @@ public Builder mergeFrom( * @return Whether the table field is set. */ public boolean hasTable() { - return tableBuilder_ != null || table_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -624,11 +628,11 @@ public Builder setTable(com.google.bigtable.admin.v2.Table value) { throw new NullPointerException(); } table_ = value; - onChanged(); } else { tableBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -645,11 +649,11 @@ public Builder setTable(com.google.bigtable.admin.v2.Table value) { public Builder setTable(com.google.bigtable.admin.v2.Table.Builder builderForValue) { if (tableBuilder_ == null) { table_ = builderForValue.build(); - onChanged(); } else { tableBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -665,17 +669,18 @@ public Builder setTable(com.google.bigtable.admin.v2.Table.Builder builderForVal */ public Builder mergeTable(com.google.bigtable.admin.v2.Table value) { if (tableBuilder_ == null) { - if (table_ != null) { - table_ = - com.google.bigtable.admin.v2.Table.newBuilder(table_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && table_ != null + && table_ != com.google.bigtable.admin.v2.Table.getDefaultInstance()) { + getTableBuilder().mergeFrom(value); } else { table_ = value; } - onChanged(); } else { tableBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -690,14 +695,13 @@ public Builder mergeTable(com.google.bigtable.admin.v2.Table value) { * */ public Builder clearTable() { - if (tableBuilder_ == null) { - table_ = null; - onChanged(); - } else { - table_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + table_ = null; + if (tableBuilder_ != null) { + tableBuilder_.dispose(); tableBuilder_ = null; } - + onChanged(); return this; } /** @@ -712,7 +716,7 @@ public Builder clearTable() { * */ public com.google.bigtable.admin.v2.Table.Builder getTableBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getTableFieldBuilder().getBuilder(); } @@ -788,7 +792,7 @@ public com.google.bigtable.admin.v2.TableOrBuilder getTableOrBuilder() { * @return Whether the updateMask field is set. */ public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -841,11 +845,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { throw new NullPointerException(); } updateMask_ = value; - onChanged(); } else { updateMaskBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -868,11 +872,11 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { if (updateMaskBuilder_ == null) { updateMask_ = builderForValue.build(); - onChanged(); } else { updateMaskBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -894,17 +898,18 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal */ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && updateMask_ != null + && updateMask_ != com.google.protobuf.FieldMask.getDefaultInstance()) { + getUpdateMaskBuilder().mergeFrom(value); } else { updateMask_ = value; } - onChanged(); } else { updateMaskBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -925,14 +930,13 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * */ public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + updateMask_ = null; + if (updateMaskBuilder_ != null) { + updateMaskBuilder_.dispose(); updateMaskBuilder_ = null; } - + onChanged(); return this; } /** @@ -953,7 +957,7 @@ public Builder clearUpdateMask() { * */ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getUpdateMaskFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index a2269c1f99..5fa47c8f5e 100644 --- a/proto-google-cloud-bigtable-v2/pom.xml +++ b/proto-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-v2 - 2.18.1 + 2.18.2 proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 2.18.1 + 2.18.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 2.18.1 + 2.18.2 pom import com.google.cloud google-cloud-bigtable-bom - 2.18.1 + 2.18.2 pom import diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java index d6b97cdc4b..cbb72e7319 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java @@ -67,7 +67,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int TIMESTAMP_MICROS_FIELD_NUMBER = 1; - private long timestampMicros_; + private long timestampMicros_ = 0L; /** * * @@ -90,7 +90,7 @@ public long getTimestampMicros() { } public static final int VALUE_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString value_; + private com.google.protobuf.ByteString value_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -110,6 +110,8 @@ public com.google.protobuf.ByteString getValue() { } public static final int LABELS_FIELD_NUMBER = 3; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList labels_; /** * @@ -388,12 +390,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; timestampMicros_ = 0L; - value_ = com.google.protobuf.ByteString.EMPTY; - labels_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -419,18 +420,32 @@ public com.google.bigtable.v2.Cell build() { @java.lang.Override public com.google.bigtable.v2.Cell buildPartial() { com.google.bigtable.v2.Cell result = new com.google.bigtable.v2.Cell(this); - int from_bitField0_ = bitField0_; - result.timestampMicros_ = timestampMicros_; - result.value_ = value_; - if (((bitField0_ & 0x00000001) != 0)) { - labels_ = labels_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000001); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } - result.labels_ = labels_; onBuilt(); return result; } + private void buildPartialRepeatedFields(com.google.bigtable.v2.Cell result) { + if (((bitField0_ & 0x00000004) != 0)) { + labels_ = labels_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.labels_ = labels_; + } + + private void buildPartial0(com.google.bigtable.v2.Cell result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.timestampMicros_ = timestampMicros_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.value_ = value_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -485,7 +500,7 @@ public Builder mergeFrom(com.google.bigtable.v2.Cell other) { if (!other.labels_.isEmpty()) { if (labels_.isEmpty()) { labels_ = other.labels_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); } else { ensureLabelsIsMutable(); labels_.addAll(other.labels_); @@ -521,13 +536,13 @@ public Builder mergeFrom( case 8: { timestampMicros_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 case 18: { value_ = input.readBytes(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: @@ -597,6 +612,7 @@ public long getTimestampMicros() { public Builder setTimestampMicros(long value) { timestampMicros_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -617,7 +633,7 @@ public Builder setTimestampMicros(long value) { * @return This builder for chaining. */ public Builder clearTimestampMicros() { - + bitField0_ = (bitField0_ & ~0x00000001); timestampMicros_ = 0L; onChanged(); return this; @@ -659,8 +675,8 @@ public Builder setValue(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - value_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -678,7 +694,7 @@ public Builder setValue(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearValue() { - + bitField0_ = (bitField0_ & ~0x00000002); value_ = getDefaultInstance().getValue(); onChanged(); return this; @@ -688,9 +704,9 @@ public Builder clearValue() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLabelsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000004) != 0)) { labels_ = new com.google.protobuf.LazyStringArrayList(labels_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; } } /** @@ -825,7 +841,7 @@ public Builder addAllLabels(java.lang.Iterable values) { */ public Builder clearLabels() { labels_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java index a45a41ba9b..9cb508f1f2 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java @@ -72,7 +72,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int TABLE_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object tableName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object tableName_ = ""; /** * * @@ -131,7 +133,9 @@ public com.google.protobuf.ByteString getTableNameBytes() { } public static final int APP_PROFILE_ID_FIELD_NUMBER = 7; - private volatile java.lang.Object appProfileId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object appProfileId_ = ""; /** * * @@ -182,7 +186,7 @@ public com.google.protobuf.ByteString getAppProfileIdBytes() { } public static final int ROW_KEY_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString rowKey_; + private com.google.protobuf.ByteString rowKey_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -253,10 +257,14 @@ public com.google.bigtable.v2.RowFilter getPredicateFilter() { */ @java.lang.Override public com.google.bigtable.v2.RowFilterOrBuilder getPredicateFilterOrBuilder() { - return getPredicateFilter(); + return predicateFilter_ == null + ? com.google.bigtable.v2.RowFilter.getDefaultInstance() + : predicateFilter_; } public static final int TRUE_MUTATIONS_FIELD_NUMBER = 4; + + @SuppressWarnings("serial") private java.util.List trueMutations_; /** * @@ -346,6 +354,8 @@ public com.google.bigtable.v2.MutationOrBuilder getTrueMutationsOrBuilder(int in } public static final int FALSE_MUTATIONS_FIELD_NUMBER = 5; + + @SuppressWarnings("serial") private java.util.List falseMutations_; /** * @@ -685,16 +695,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; tableName_ = ""; - appProfileId_ = ""; - rowKey_ = com.google.protobuf.ByteString.EMPTY; - - if (predicateFilterBuilder_ == null) { - predicateFilter_ = null; - } else { - predicateFilter_ = null; + predicateFilter_ = null; + if (predicateFilterBuilder_ != null) { + predicateFilterBuilder_.dispose(); predicateFilterBuilder_ = null; } if (trueMutationsBuilder_ == null) { @@ -703,14 +710,14 @@ public Builder clear() { trueMutations_ = null; trueMutationsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); if (falseMutationsBuilder_ == null) { falseMutations_ = java.util.Collections.emptyList(); } else { falseMutations_ = null; falseMutationsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -738,35 +745,51 @@ public com.google.bigtable.v2.CheckAndMutateRowRequest build() { public com.google.bigtable.v2.CheckAndMutateRowRequest buildPartial() { com.google.bigtable.v2.CheckAndMutateRowRequest result = new com.google.bigtable.v2.CheckAndMutateRowRequest(this); - int from_bitField0_ = bitField0_; - result.tableName_ = tableName_; - result.appProfileId_ = appProfileId_; - result.rowKey_ = rowKey_; - if (predicateFilterBuilder_ == null) { - result.predicateFilter_ = predicateFilter_; - } else { - result.predicateFilter_ = predicateFilterBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.v2.CheckAndMutateRowRequest result) { if (trueMutationsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000010) != 0)) { trueMutations_ = java.util.Collections.unmodifiableList(trueMutations_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); } result.trueMutations_ = trueMutations_; } else { result.trueMutations_ = trueMutationsBuilder_.build(); } if (falseMutationsBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000020) != 0)) { falseMutations_ = java.util.Collections.unmodifiableList(falseMutations_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000020); } result.falseMutations_ = falseMutations_; } else { result.falseMutations_ = falseMutationsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.CheckAndMutateRowRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.tableName_ = tableName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.appProfileId_ = appProfileId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.rowKey_ = rowKey_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.predicateFilter_ = + predicateFilterBuilder_ == null ? predicateFilter_ : predicateFilterBuilder_.build(); + } } @java.lang.Override @@ -817,10 +840,12 @@ public Builder mergeFrom(com.google.bigtable.v2.CheckAndMutateRowRequest other) return this; if (!other.getTableName().isEmpty()) { tableName_ = other.tableName_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getAppProfileId().isEmpty()) { appProfileId_ = other.appProfileId_; + bitField0_ |= 0x00000002; onChanged(); } if (other.getRowKey() != com.google.protobuf.ByteString.EMPTY) { @@ -833,7 +858,7 @@ public Builder mergeFrom(com.google.bigtable.v2.CheckAndMutateRowRequest other) if (!other.trueMutations_.isEmpty()) { if (trueMutations_.isEmpty()) { trueMutations_ = other.trueMutations_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); } else { ensureTrueMutationsIsMutable(); trueMutations_.addAll(other.trueMutations_); @@ -846,7 +871,7 @@ public Builder mergeFrom(com.google.bigtable.v2.CheckAndMutateRowRequest other) trueMutationsBuilder_.dispose(); trueMutationsBuilder_ = null; trueMutations_ = other.trueMutations_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); trueMutationsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getTrueMutationsFieldBuilder() @@ -860,7 +885,7 @@ public Builder mergeFrom(com.google.bigtable.v2.CheckAndMutateRowRequest other) if (!other.falseMutations_.isEmpty()) { if (falseMutations_.isEmpty()) { falseMutations_ = other.falseMutations_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000020); } else { ensureFalseMutationsIsMutable(); falseMutations_.addAll(other.falseMutations_); @@ -873,7 +898,7 @@ public Builder mergeFrom(com.google.bigtable.v2.CheckAndMutateRowRequest other) falseMutationsBuilder_.dispose(); falseMutationsBuilder_ = null; falseMutations_ = other.falseMutations_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000020); falseMutationsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getFalseMutationsFieldBuilder() @@ -912,13 +937,13 @@ public Builder mergeFrom( case 10: { tableName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { rowKey_ = input.readBytes(); - + bitField0_ |= 0x00000004; break; } // case 18 case 34: @@ -948,13 +973,13 @@ public Builder mergeFrom( case 50: { input.readMessage(getPredicateFilterFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 50 case 58: { appProfileId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 58 default: @@ -1052,8 +1077,8 @@ public Builder setTableName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1074,8 +1099,8 @@ public Builder setTableName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTableName() { - tableName_ = getDefaultInstance().getTableName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1101,8 +1126,8 @@ public Builder setTableNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1171,8 +1196,8 @@ public Builder setAppProfileId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1189,8 +1214,8 @@ public Builder setAppProfileId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAppProfileId() { - appProfileId_ = getDefaultInstance().getAppProfileId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1212,8 +1237,8 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1250,8 +1275,8 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - rowKey_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1267,7 +1292,7 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearRowKey() { - + bitField0_ = (bitField0_ & ~0x00000004); rowKey_ = getDefaultInstance().getRowKey(); onChanged(); return this; @@ -1294,7 +1319,7 @@ public Builder clearRowKey() { * @return Whether the predicateFilter field is set. */ public boolean hasPredicateFilter() { - return predicateFilterBuilder_ != null || predicateFilter_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1337,11 +1362,11 @@ public Builder setPredicateFilter(com.google.bigtable.v2.RowFilter value) { throw new NullPointerException(); } predicateFilter_ = value; - onChanged(); } else { predicateFilterBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1359,11 +1384,11 @@ public Builder setPredicateFilter(com.google.bigtable.v2.RowFilter value) { public Builder setPredicateFilter(com.google.bigtable.v2.RowFilter.Builder builderForValue) { if (predicateFilterBuilder_ == null) { predicateFilter_ = builderForValue.build(); - onChanged(); } else { predicateFilterBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1380,19 +1405,18 @@ public Builder setPredicateFilter(com.google.bigtable.v2.RowFilter.Builder build */ public Builder mergePredicateFilter(com.google.bigtable.v2.RowFilter value) { if (predicateFilterBuilder_ == null) { - if (predicateFilter_ != null) { - predicateFilter_ = - com.google.bigtable.v2.RowFilter.newBuilder(predicateFilter_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && predicateFilter_ != null + && predicateFilter_ != com.google.bigtable.v2.RowFilter.getDefaultInstance()) { + getPredicateFilterBuilder().mergeFrom(value); } else { predicateFilter_ = value; } - onChanged(); } else { predicateFilterBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1408,14 +1432,13 @@ public Builder mergePredicateFilter(com.google.bigtable.v2.RowFilter value) { * .google.bigtable.v2.RowFilter predicate_filter = 6; */ public Builder clearPredicateFilter() { - if (predicateFilterBuilder_ == null) { - predicateFilter_ = null; - onChanged(); - } else { - predicateFilter_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + predicateFilter_ = null; + if (predicateFilterBuilder_ != null) { + predicateFilterBuilder_.dispose(); predicateFilterBuilder_ = null; } - + onChanged(); return this; } /** @@ -1431,7 +1454,7 @@ public Builder clearPredicateFilter() { * .google.bigtable.v2.RowFilter predicate_filter = 6; */ public com.google.bigtable.v2.RowFilter.Builder getPredicateFilterBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getPredicateFilterFieldBuilder().getBuilder(); } @@ -1489,9 +1512,9 @@ public com.google.bigtable.v2.RowFilterOrBuilder getPredicateFilterOrBuilder() { java.util.Collections.emptyList(); private void ensureTrueMutationsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000010) != 0)) { trueMutations_ = new java.util.ArrayList(trueMutations_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000010; } } @@ -1750,7 +1773,7 @@ public Builder addAllTrueMutations( public Builder clearTrueMutations() { if (trueMutationsBuilder_ == null) { trueMutations_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); } else { trueMutationsBuilder_.clear(); @@ -1900,7 +1923,7 @@ public java.util.List getTrueMutationsB com.google.bigtable.v2.Mutation.Builder, com.google.bigtable.v2.MutationOrBuilder>( trueMutations_, - ((bitField0_ & 0x00000001) != 0), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); trueMutations_ = null; @@ -1912,9 +1935,9 @@ public java.util.List getTrueMutationsB java.util.Collections.emptyList(); private void ensureFalseMutationsIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000020) != 0)) { falseMutations_ = new java.util.ArrayList(falseMutations_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000020; } } @@ -2173,7 +2196,7 @@ public Builder addAllFalseMutations( public Builder clearFalseMutations() { if (falseMutationsBuilder_ == null) { falseMutations_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); } else { falseMutationsBuilder_.clear(); @@ -2323,7 +2346,7 @@ public java.util.List getFalseMutations com.google.bigtable.v2.Mutation.Builder, com.google.bigtable.v2.MutationOrBuilder>( falseMutations_, - ((bitField0_ & 0x00000002) != 0), + ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); falseMutations_ = null; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java index 038804e44b..6e4ab261f2 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PREDICATE_MATCHED_FIELD_NUMBER = 1; - private boolean predicateMatched_; + private boolean predicateMatched_ = false; /** * * @@ -281,8 +281,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; predicateMatched_ = false; - return this; } @@ -310,11 +310,20 @@ public com.google.bigtable.v2.CheckAndMutateRowResponse build() { public com.google.bigtable.v2.CheckAndMutateRowResponse buildPartial() { com.google.bigtable.v2.CheckAndMutateRowResponse result = new com.google.bigtable.v2.CheckAndMutateRowResponse(this); - result.predicateMatched_ = predicateMatched_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.CheckAndMutateRowResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.predicateMatched_ = predicateMatched_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -393,7 +402,7 @@ public Builder mergeFrom( case 8: { predicateMatched_ = input.readBool(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -413,6 +422,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private boolean predicateMatched_; /** * @@ -446,6 +457,7 @@ public boolean getPredicateMatched() { public Builder setPredicateMatched(boolean value) { predicateMatched_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -462,7 +474,7 @@ public Builder setPredicateMatched(boolean value) { * @return This builder for chaining. */ public Builder clearPredicateMatched() { - + bitField0_ = (bitField0_ & ~0x00000001); predicateMatched_ = false; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java index 780f63da2d..1895a714a0 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java @@ -68,7 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int QUALIFIER_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString qualifier_; + private com.google.protobuf.ByteString qualifier_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -90,6 +90,8 @@ public com.google.protobuf.ByteString getQualifier() { } public static final int CELLS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List cells_; /** * @@ -362,15 +364,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; qualifier_ = com.google.protobuf.ByteString.EMPTY; - if (cellsBuilder_ == null) { cells_ = java.util.Collections.emptyList(); } else { cells_ = null; cellsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -396,19 +398,31 @@ public com.google.bigtable.v2.Column build() { @java.lang.Override public com.google.bigtable.v2.Column buildPartial() { com.google.bigtable.v2.Column result = new com.google.bigtable.v2.Column(this); - int from_bitField0_ = bitField0_; - result.qualifier_ = qualifier_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.bigtable.v2.Column result) { if (cellsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { cells_ = java.util.Collections.unmodifiableList(cells_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.cells_ = cells_; } else { result.cells_ = cellsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.Column result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.qualifier_ = qualifier_; + } } @java.lang.Override @@ -463,7 +477,7 @@ public Builder mergeFrom(com.google.bigtable.v2.Column other) { if (!other.cells_.isEmpty()) { if (cells_.isEmpty()) { cells_ = other.cells_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureCellsIsMutable(); cells_.addAll(other.cells_); @@ -476,7 +490,7 @@ public Builder mergeFrom(com.google.bigtable.v2.Column other) { cellsBuilder_.dispose(); cellsBuilder_ = null; cells_ = other.cells_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); cellsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getCellsFieldBuilder() @@ -515,7 +529,7 @@ public Builder mergeFrom( case 10: { qualifier_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -589,8 +603,8 @@ public Builder setQualifier(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - qualifier_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -610,7 +624,7 @@ public Builder setQualifier(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearQualifier() { - + bitField0_ = (bitField0_ & ~0x00000001); qualifier_ = getDefaultInstance().getQualifier(); onChanged(); return this; @@ -619,9 +633,9 @@ public Builder clearQualifier() { private java.util.List cells_ = java.util.Collections.emptyList(); private void ensureCellsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { cells_ = new java.util.ArrayList(cells_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -833,7 +847,7 @@ public Builder addAllCells(java.lang.Iterable getCellsBuilderList() com.google.bigtable.v2.Cell, com.google.bigtable.v2.Cell.Builder, com.google.bigtable.v2.CellOrBuilder>( - cells_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + cells_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); cells_ = null; } return cellsBuilder_; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java index a5da9d1288..be393cc473 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java @@ -165,7 +165,9 @@ public EndQualifierCase getEndQualifierCase() { } public static final int FAMILY_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object familyName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object familyName_ = ""; /** * * @@ -629,8 +631,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; familyName_ = ""; - startQualifierCase_ = 0; startQualifier_ = null; endQualifierCase_ = 0; @@ -661,23 +663,26 @@ public com.google.bigtable.v2.ColumnRange build() { @java.lang.Override public com.google.bigtable.v2.ColumnRange buildPartial() { com.google.bigtable.v2.ColumnRange result = new com.google.bigtable.v2.ColumnRange(this); - result.familyName_ = familyName_; - if (startQualifierCase_ == 2) { - result.startQualifier_ = startQualifier_; + if (bitField0_ != 0) { + buildPartial0(result); } - if (startQualifierCase_ == 3) { - result.startQualifier_ = startQualifier_; - } - if (endQualifierCase_ == 4) { - result.endQualifier_ = endQualifier_; - } - if (endQualifierCase_ == 5) { - result.endQualifier_ = endQualifier_; + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartial0(com.google.bigtable.v2.ColumnRange result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.familyName_ = familyName_; } + } + + private void buildPartialOneofs(com.google.bigtable.v2.ColumnRange result) { result.startQualifierCase_ = startQualifierCase_; + result.startQualifier_ = this.startQualifier_; result.endQualifierCase_ = endQualifierCase_; - onBuilt(); - return result; + result.endQualifier_ = this.endQualifier_; } @java.lang.Override @@ -727,6 +732,7 @@ public Builder mergeFrom(com.google.bigtable.v2.ColumnRange other) { if (other == com.google.bigtable.v2.ColumnRange.getDefaultInstance()) return this; if (!other.getFamilyName().isEmpty()) { familyName_ = other.familyName_; + bitField0_ |= 0x00000001; onChanged(); } switch (other.getStartQualifierCase()) { @@ -790,7 +796,7 @@ public Builder mergeFrom( case 10: { familyName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -862,6 +868,8 @@ public Builder clearEndQualifier() { return this; } + private int bitField0_; + private java.lang.Object familyName_ = ""; /** * @@ -923,8 +931,8 @@ public Builder setFamilyName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - familyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -940,8 +948,8 @@ public Builder setFamilyName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFamilyName() { - familyName_ = getDefaultInstance().getFamilyName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -962,8 +970,8 @@ public Builder setFamilyNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - familyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java index 25e73be090..3238aa5c2d 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -127,6 +129,8 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int COLUMNS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List columns_; /** * @@ -400,15 +404,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - if (columnsBuilder_ == null) { columns_ = java.util.Collections.emptyList(); } else { columns_ = null; columnsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -434,19 +438,31 @@ public com.google.bigtable.v2.Family build() { @java.lang.Override public com.google.bigtable.v2.Family buildPartial() { com.google.bigtable.v2.Family result = new com.google.bigtable.v2.Family(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.bigtable.v2.Family result) { if (columnsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { columns_ = java.util.Collections.unmodifiableList(columns_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.columns_ = columns_; } else { result.columns_ = columnsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.Family result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } } @java.lang.Override @@ -496,13 +512,14 @@ public Builder mergeFrom(com.google.bigtable.v2.Family other) { if (other == com.google.bigtable.v2.Family.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (columnsBuilder_ == null) { if (!other.columns_.isEmpty()) { if (columns_.isEmpty()) { columns_ = other.columns_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureColumnsIsMutable(); columns_.addAll(other.columns_); @@ -515,7 +532,7 @@ public Builder mergeFrom(com.google.bigtable.v2.Family other) { columnsBuilder_.dispose(); columnsBuilder_ = null; columns_ = other.columns_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); columnsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getColumnsFieldBuilder() @@ -554,7 +571,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -664,8 +681,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -686,8 +703,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -713,8 +730,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -723,9 +740,9 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureColumnsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { columns_ = new java.util.ArrayList(columns_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -938,7 +955,7 @@ public Builder addAllColumns( public Builder clearColumns() { if (columnsBuilder_ == null) { columns_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { columnsBuilder_.clear(); @@ -1059,7 +1076,7 @@ public java.util.List getColumnsBuilderLi com.google.bigtable.v2.Column, com.google.bigtable.v2.Column.Builder, com.google.bigtable.v2.ColumnOrBuilder>( - columns_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + columns_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); columns_ = null; } return columnsBuilder_; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/FullReadStatsView.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/FullReadStatsView.java index f0e0c2b726..dd392fe45f 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/FullReadStatsView.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/FullReadStatsView.java @@ -119,7 +119,9 @@ public com.google.bigtable.v2.ReadIterationStats getReadIterationStats() { */ @java.lang.Override public com.google.bigtable.v2.ReadIterationStatsOrBuilder getReadIterationStatsOrBuilder() { - return getReadIterationStats(); + return readIterationStats_ == null + ? com.google.bigtable.v2.ReadIterationStats.getDefaultInstance() + : readIterationStats_; } public static final int REQUEST_LATENCY_STATS_FIELD_NUMBER = 2; @@ -170,7 +172,9 @@ public com.google.bigtable.v2.RequestLatencyStats getRequestLatencyStats() { */ @java.lang.Override public com.google.bigtable.v2.RequestLatencyStatsOrBuilder getRequestLatencyStatsOrBuilder() { - return getRequestLatencyStats(); + return requestLatencyStats_ == null + ? com.google.bigtable.v2.RequestLatencyStats.getDefaultInstance() + : requestLatencyStats_; } private byte memoizedIsInitialized = -1; @@ -388,16 +392,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (readIterationStatsBuilder_ == null) { - readIterationStats_ = null; - } else { - readIterationStats_ = null; + bitField0_ = 0; + readIterationStats_ = null; + if (readIterationStatsBuilder_ != null) { + readIterationStatsBuilder_.dispose(); readIterationStatsBuilder_ = null; } - if (requestLatencyStatsBuilder_ == null) { - requestLatencyStats_ = null; - } else { - requestLatencyStats_ = null; + requestLatencyStats_ = null; + if (requestLatencyStatsBuilder_ != null) { + requestLatencyStatsBuilder_.dispose(); requestLatencyStatsBuilder_ = null; } return this; @@ -427,20 +430,29 @@ public com.google.bigtable.v2.FullReadStatsView build() { public com.google.bigtable.v2.FullReadStatsView buildPartial() { com.google.bigtable.v2.FullReadStatsView result = new com.google.bigtable.v2.FullReadStatsView(this); - if (readIterationStatsBuilder_ == null) { - result.readIterationStats_ = readIterationStats_; - } else { - result.readIterationStats_ = readIterationStatsBuilder_.build(); - } - if (requestLatencyStatsBuilder_ == null) { - result.requestLatencyStats_ = requestLatencyStats_; - } else { - result.requestLatencyStats_ = requestLatencyStatsBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.FullReadStatsView result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.readIterationStats_ = + readIterationStatsBuilder_ == null + ? readIterationStats_ + : readIterationStatsBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.requestLatencyStats_ = + requestLatencyStatsBuilder_ == null + ? requestLatencyStats_ + : requestLatencyStatsBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -522,14 +534,14 @@ public Builder mergeFrom( { input.readMessage( getReadIterationStatsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( getRequestLatencyStatsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -549,6 +561,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.v2.ReadIterationStats readIterationStats_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.ReadIterationStats, @@ -570,7 +584,7 @@ public Builder mergeFrom( * @return Whether the readIterationStats field is set. */ public boolean hasReadIterationStats() { - return readIterationStatsBuilder_ != null || readIterationStats_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -613,11 +627,11 @@ public Builder setReadIterationStats(com.google.bigtable.v2.ReadIterationStats v throw new NullPointerException(); } readIterationStats_ = value; - onChanged(); } else { readIterationStatsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -636,11 +650,11 @@ public Builder setReadIterationStats( com.google.bigtable.v2.ReadIterationStats.Builder builderForValue) { if (readIterationStatsBuilder_ == null) { readIterationStats_ = builderForValue.build(); - onChanged(); } else { readIterationStatsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -657,19 +671,19 @@ public Builder setReadIterationStats( */ public Builder mergeReadIterationStats(com.google.bigtable.v2.ReadIterationStats value) { if (readIterationStatsBuilder_ == null) { - if (readIterationStats_ != null) { - readIterationStats_ = - com.google.bigtable.v2.ReadIterationStats.newBuilder(readIterationStats_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && readIterationStats_ != null + && readIterationStats_ + != com.google.bigtable.v2.ReadIterationStats.getDefaultInstance()) { + getReadIterationStatsBuilder().mergeFrom(value); } else { readIterationStats_ = value; } - onChanged(); } else { readIterationStatsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -685,14 +699,13 @@ public Builder mergeReadIterationStats(com.google.bigtable.v2.ReadIterationStats * .google.bigtable.v2.ReadIterationStats read_iteration_stats = 1; */ public Builder clearReadIterationStats() { - if (readIterationStatsBuilder_ == null) { - readIterationStats_ = null; - onChanged(); - } else { - readIterationStats_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + readIterationStats_ = null; + if (readIterationStatsBuilder_ != null) { + readIterationStatsBuilder_.dispose(); readIterationStatsBuilder_ = null; } - + onChanged(); return this; } /** @@ -708,7 +721,7 @@ public Builder clearReadIterationStats() { * .google.bigtable.v2.ReadIterationStats read_iteration_stats = 1; */ public com.google.bigtable.v2.ReadIterationStats.Builder getReadIterationStatsBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getReadIterationStatsFieldBuilder().getBuilder(); } @@ -781,7 +794,7 @@ public com.google.bigtable.v2.ReadIterationStatsOrBuilder getReadIterationStatsO * @return Whether the requestLatencyStats field is set. */ public boolean hasRequestLatencyStats() { - return requestLatencyStatsBuilder_ != null || requestLatencyStats_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -820,11 +833,11 @@ public Builder setRequestLatencyStats(com.google.bigtable.v2.RequestLatencyStats throw new NullPointerException(); } requestLatencyStats_ = value; - onChanged(); } else { requestLatencyStatsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -841,11 +854,11 @@ public Builder setRequestLatencyStats( com.google.bigtable.v2.RequestLatencyStats.Builder builderForValue) { if (requestLatencyStatsBuilder_ == null) { requestLatencyStats_ = builderForValue.build(); - onChanged(); } else { requestLatencyStatsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -860,19 +873,19 @@ public Builder setRequestLatencyStats( */ public Builder mergeRequestLatencyStats(com.google.bigtable.v2.RequestLatencyStats value) { if (requestLatencyStatsBuilder_ == null) { - if (requestLatencyStats_ != null) { - requestLatencyStats_ = - com.google.bigtable.v2.RequestLatencyStats.newBuilder(requestLatencyStats_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && requestLatencyStats_ != null + && requestLatencyStats_ + != com.google.bigtable.v2.RequestLatencyStats.getDefaultInstance()) { + getRequestLatencyStatsBuilder().mergeFrom(value); } else { requestLatencyStats_ = value; } - onChanged(); } else { requestLatencyStatsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -886,14 +899,13 @@ public Builder mergeRequestLatencyStats(com.google.bigtable.v2.RequestLatencySta * .google.bigtable.v2.RequestLatencyStats request_latency_stats = 2; */ public Builder clearRequestLatencyStats() { - if (requestLatencyStatsBuilder_ == null) { - requestLatencyStats_ = null; - onChanged(); - } else { - requestLatencyStats_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + requestLatencyStats_ = null; + if (requestLatencyStatsBuilder_ != null) { + requestLatencyStatsBuilder_.dispose(); requestLatencyStatsBuilder_ = null; } - + onChanged(); return this; } /** @@ -907,7 +919,7 @@ public Builder clearRequestLatencyStats() { * .google.bigtable.v2.RequestLatencyStats request_latency_stats = 2; */ public com.google.bigtable.v2.RequestLatencyStats.Builder getRequestLatencyStatsBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRequestLatencyStatsFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java index 00c657bb3a..db600264fb 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java @@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int TABLE_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object tableName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object tableName_ = ""; /** * * @@ -128,7 +130,9 @@ public com.google.protobuf.ByteString getTableNameBytes() { } public static final int APP_PROFILE_ID_FIELD_NUMBER = 4; - private volatile java.lang.Object appProfileId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object appProfileId_ = ""; /** * * @@ -179,7 +183,7 @@ public com.google.protobuf.ByteString getAppProfileIdBytes() { } public static final int ROW_KEY_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString rowKey_; + private com.google.protobuf.ByteString rowKey_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -197,6 +201,8 @@ public com.google.protobuf.ByteString getRowKey() { } public static final int MUTATIONS_FIELD_NUMBER = 3; + + @SuppressWarnings("serial") private java.util.List mutations_; /** * @@ -510,19 +516,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; tableName_ = ""; - appProfileId_ = ""; - rowKey_ = com.google.protobuf.ByteString.EMPTY; - if (mutationsBuilder_ == null) { mutations_ = java.util.Collections.emptyList(); } else { mutations_ = null; mutationsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -550,21 +554,37 @@ public com.google.bigtable.v2.MutateRowRequest build() { public com.google.bigtable.v2.MutateRowRequest buildPartial() { com.google.bigtable.v2.MutateRowRequest result = new com.google.bigtable.v2.MutateRowRequest(this); - int from_bitField0_ = bitField0_; - result.tableName_ = tableName_; - result.appProfileId_ = appProfileId_; - result.rowKey_ = rowKey_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.bigtable.v2.MutateRowRequest result) { if (mutationsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000008) != 0)) { mutations_ = java.util.Collections.unmodifiableList(mutations_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } result.mutations_ = mutations_; } else { result.mutations_ = mutationsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.MutateRowRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.tableName_ = tableName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.appProfileId_ = appProfileId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.rowKey_ = rowKey_; + } } @java.lang.Override @@ -614,10 +634,12 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowRequest other) { if (other == com.google.bigtable.v2.MutateRowRequest.getDefaultInstance()) return this; if (!other.getTableName().isEmpty()) { tableName_ = other.tableName_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getAppProfileId().isEmpty()) { appProfileId_ = other.appProfileId_; + bitField0_ |= 0x00000002; onChanged(); } if (other.getRowKey() != com.google.protobuf.ByteString.EMPTY) { @@ -627,7 +649,7 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowRequest other) { if (!other.mutations_.isEmpty()) { if (mutations_.isEmpty()) { mutations_ = other.mutations_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureMutationsIsMutable(); mutations_.addAll(other.mutations_); @@ -640,7 +662,7 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowRequest other) { mutationsBuilder_.dispose(); mutationsBuilder_ = null; mutations_ = other.mutations_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); mutationsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getMutationsFieldBuilder() @@ -679,13 +701,13 @@ public Builder mergeFrom( case 10: { tableName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { rowKey_ = input.readBytes(); - + bitField0_ |= 0x00000004; break; } // case 18 case 26: @@ -703,7 +725,7 @@ public Builder mergeFrom( case 34: { appProfileId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 34 default: @@ -798,8 +820,8 @@ public Builder setTableName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -819,8 +841,8 @@ public Builder setTableName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTableName() { - tableName_ = getDefaultInstance().getTableName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -845,8 +867,8 @@ public Builder setTableNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -915,8 +937,8 @@ public Builder setAppProfileId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -933,8 +955,8 @@ public Builder setAppProfileId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAppProfileId() { - appProfileId_ = getDefaultInstance().getAppProfileId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -956,8 +978,8 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -994,8 +1016,8 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - rowKey_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1011,7 +1033,7 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearRowKey() { - + bitField0_ = (bitField0_ & ~0x00000004); rowKey_ = getDefaultInstance().getRowKey(); onChanged(); return this; @@ -1021,9 +1043,9 @@ public Builder clearRowKey() { java.util.Collections.emptyList(); private void ensureMutationsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000008) != 0)) { mutations_ = new java.util.ArrayList(mutations_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000008; } } @@ -1282,7 +1304,7 @@ public Builder addAllMutations( public Builder clearMutations() { if (mutationsBuilder_ == null) { mutations_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { mutationsBuilder_.clear(); @@ -1431,7 +1453,7 @@ public java.util.List getMutationsBuild com.google.bigtable.v2.Mutation, com.google.bigtable.v2.Mutation.Builder, com.google.bigtable.v2.MutationOrBuilder>( - mutations_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + mutations_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); mutations_ = null; } return mutationsBuilder_; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java index 72a373f79d..02dff468fe 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java @@ -214,7 +214,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ROW_KEY_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString rowKey_; + private com.google.protobuf.ByteString rowKey_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -232,6 +232,8 @@ public com.google.protobuf.ByteString getRowKey() { } public static final int MUTATIONS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List mutations_; /** * @@ -535,15 +537,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; rowKey_ = com.google.protobuf.ByteString.EMPTY; - if (mutationsBuilder_ == null) { mutations_ = java.util.Collections.emptyList(); } else { mutations_ = null; mutationsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -571,19 +573,32 @@ public com.google.bigtable.v2.MutateRowsRequest.Entry build() { public com.google.bigtable.v2.MutateRowsRequest.Entry buildPartial() { com.google.bigtable.v2.MutateRowsRequest.Entry result = new com.google.bigtable.v2.MutateRowsRequest.Entry(this); - int from_bitField0_ = bitField0_; - result.rowKey_ = rowKey_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.v2.MutateRowsRequest.Entry result) { if (mutationsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { mutations_ = java.util.Collections.unmodifiableList(mutations_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.mutations_ = mutations_; } else { result.mutations_ = mutationsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.MutateRowsRequest.Entry result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.rowKey_ = rowKey_; + } } @java.lang.Override @@ -641,7 +656,7 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowsRequest.Entry other) { if (!other.mutations_.isEmpty()) { if (mutations_.isEmpty()) { mutations_ = other.mutations_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureMutationsIsMutable(); mutations_.addAll(other.mutations_); @@ -654,7 +669,7 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowsRequest.Entry other) { mutationsBuilder_.dispose(); mutationsBuilder_ = null; mutations_ = other.mutations_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); mutationsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getMutationsFieldBuilder() @@ -693,7 +708,7 @@ public Builder mergeFrom( case 10: { rowKey_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -760,8 +775,8 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - rowKey_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -777,7 +792,7 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearRowKey() { - + bitField0_ = (bitField0_ & ~0x00000001); rowKey_ = getDefaultInstance().getRowKey(); onChanged(); return this; @@ -787,9 +802,9 @@ public Builder clearRowKey() { java.util.Collections.emptyList(); private void ensureMutationsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { mutations_ = new java.util.ArrayList(mutations_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -1059,7 +1074,7 @@ public Builder addAllMutations( public Builder clearMutations() { if (mutationsBuilder_ == null) { mutations_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { mutationsBuilder_.clear(); @@ -1215,7 +1230,7 @@ public java.util.List getMutationsBuild com.google.bigtable.v2.Mutation, com.google.bigtable.v2.Mutation.Builder, com.google.bigtable.v2.MutationOrBuilder>( - mutations_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + mutations_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); mutations_ = null; } return mutationsBuilder_; @@ -1286,7 +1301,9 @@ public com.google.bigtable.v2.MutateRowsRequest.Entry getDefaultInstanceForType( } public static final int TABLE_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object tableName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object tableName_ = ""; /** * * @@ -1339,7 +1356,9 @@ public com.google.protobuf.ByteString getTableNameBytes() { } public static final int APP_PROFILE_ID_FIELD_NUMBER = 3; - private volatile java.lang.Object appProfileId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object appProfileId_ = ""; /** * * @@ -1390,6 +1409,8 @@ public com.google.protobuf.ByteString getAppProfileIdBytes() { } public static final int ENTRIES_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List entries_; /** * @@ -1704,17 +1725,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; tableName_ = ""; - appProfileId_ = ""; - if (entriesBuilder_ == null) { entries_ = java.util.Collections.emptyList(); } else { entries_ = null; entriesBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -1742,20 +1762,34 @@ public com.google.bigtable.v2.MutateRowsRequest build() { public com.google.bigtable.v2.MutateRowsRequest buildPartial() { com.google.bigtable.v2.MutateRowsRequest result = new com.google.bigtable.v2.MutateRowsRequest(this); - int from_bitField0_ = bitField0_; - result.tableName_ = tableName_; - result.appProfileId_ = appProfileId_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.bigtable.v2.MutateRowsRequest result) { if (entriesBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000004) != 0)) { entries_ = java.util.Collections.unmodifiableList(entries_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); } result.entries_ = entries_; } else { result.entries_ = entriesBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.MutateRowsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.tableName_ = tableName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.appProfileId_ = appProfileId_; + } } @java.lang.Override @@ -1805,17 +1839,19 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowsRequest other) { if (other == com.google.bigtable.v2.MutateRowsRequest.getDefaultInstance()) return this; if (!other.getTableName().isEmpty()) { tableName_ = other.tableName_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getAppProfileId().isEmpty()) { appProfileId_ = other.appProfileId_; + bitField0_ |= 0x00000002; onChanged(); } if (entriesBuilder_ == null) { if (!other.entries_.isEmpty()) { if (entries_.isEmpty()) { entries_ = other.entries_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); } else { ensureEntriesIsMutable(); entries_.addAll(other.entries_); @@ -1828,7 +1864,7 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowsRequest other) { entriesBuilder_.dispose(); entriesBuilder_ = null; entries_ = other.entries_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); entriesBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getEntriesFieldBuilder() @@ -1867,7 +1903,7 @@ public Builder mergeFrom( case 10: { tableName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -1886,7 +1922,7 @@ public Builder mergeFrom( case 26: { appProfileId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 26 default: @@ -1975,8 +2011,8 @@ public Builder setTableName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1994,8 +2030,8 @@ public Builder setTableName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTableName() { - tableName_ = getDefaultInstance().getTableName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -2018,8 +2054,8 @@ public Builder setTableNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2088,8 +2124,8 @@ public Builder setAppProfileId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2106,8 +2142,8 @@ public Builder setAppProfileId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAppProfileId() { - appProfileId_ = getDefaultInstance().getAppProfileId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -2129,8 +2165,8 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2139,10 +2175,10 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureEntriesIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000004) != 0)) { entries_ = new java.util.ArrayList(entries_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; } } @@ -2424,7 +2460,7 @@ public Builder addAllEntries( public Builder clearEntries() { if (entriesBuilder_ == null) { entries_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); } else { entriesBuilder_.clear(); @@ -2588,7 +2624,7 @@ public com.google.bigtable.v2.MutateRowsRequest.Entry.Builder addEntriesBuilder( com.google.bigtable.v2.MutateRowsRequest.Entry, com.google.bigtable.v2.MutateRowsRequest.Entry.Builder, com.google.bigtable.v2.MutateRowsRequest.EntryOrBuilder>( - entries_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + entries_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); entries_ = null; } return entriesBuilder_; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java index 783b6f4faa..24803ec454 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java @@ -178,7 +178,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int INDEX_FIELD_NUMBER = 1; - private long index_; + private long index_ = 0L; /** * * @@ -248,7 +248,7 @@ public com.google.rpc.Status getStatus() { */ @java.lang.Override public com.google.rpc.StatusOrBuilder getStatusOrBuilder() { - return getStatus(); + return status_ == null ? com.google.rpc.Status.getDefaultInstance() : status_; } private byte memoizedIsInitialized = -1; @@ -464,12 +464,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; index_ = 0L; - - if (statusBuilder_ == null) { - status_ = null; - } else { - status_ = null; + status_ = null; + if (statusBuilder_ != null) { + statusBuilder_.dispose(); statusBuilder_ = null; } return this; @@ -499,16 +498,23 @@ public com.google.bigtable.v2.MutateRowsResponse.Entry build() { public com.google.bigtable.v2.MutateRowsResponse.Entry buildPartial() { com.google.bigtable.v2.MutateRowsResponse.Entry result = new com.google.bigtable.v2.MutateRowsResponse.Entry(this); - result.index_ = index_; - if (statusBuilder_ == null) { - result.status_ = status_; - } else { - result.status_ = statusBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.MutateRowsResponse.Entry result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.index_ = index_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.status_ = statusBuilder_ == null ? status_ : statusBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -592,13 +598,13 @@ public Builder mergeFrom( case 8: { index_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 case 18: { input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -618,6 +624,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private long index_; /** * @@ -651,6 +659,7 @@ public long getIndex() { public Builder setIndex(long value) { index_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -667,7 +676,7 @@ public Builder setIndex(long value) { * @return This builder for chaining. */ public Builder clearIndex() { - + bitField0_ = (bitField0_ & ~0x00000001); index_ = 0L; onChanged(); return this; @@ -692,7 +701,7 @@ public Builder clearIndex() { * @return Whether the status field is set. */ public boolean hasStatus() { - return statusBuilder_ != null || status_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -733,11 +742,11 @@ public Builder setStatus(com.google.rpc.Status value) { throw new NullPointerException(); } status_ = value; - onChanged(); } else { statusBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -755,11 +764,11 @@ public Builder setStatus(com.google.rpc.Status value) { public Builder setStatus(com.google.rpc.Status.Builder builderForValue) { if (statusBuilder_ == null) { status_ = builderForValue.build(); - onChanged(); } else { statusBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -776,16 +785,18 @@ public Builder setStatus(com.google.rpc.Status.Builder builderForValue) { */ public Builder mergeStatus(com.google.rpc.Status value) { if (statusBuilder_ == null) { - if (status_ != null) { - status_ = com.google.rpc.Status.newBuilder(status_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && status_ != null + && status_ != com.google.rpc.Status.getDefaultInstance()) { + getStatusBuilder().mergeFrom(value); } else { status_ = value; } - onChanged(); } else { statusBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -801,14 +812,13 @@ public Builder mergeStatus(com.google.rpc.Status value) { * .google.rpc.Status status = 2; */ public Builder clearStatus() { - if (statusBuilder_ == null) { - status_ = null; - onChanged(); - } else { - status_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + status_ = null; + if (statusBuilder_ != null) { + statusBuilder_.dispose(); statusBuilder_ = null; } - + onChanged(); return this; } /** @@ -824,7 +834,7 @@ public Builder clearStatus() { * .google.rpc.Status status = 2; */ public com.google.rpc.Status.Builder getStatusBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getStatusFieldBuilder().getBuilder(); } @@ -938,6 +948,8 @@ public com.google.bigtable.v2.MutateRowsResponse.Entry getDefaultInstanceForType } public static final int ENTRIES_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List entries_; /** * @@ -1205,6 +1217,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (entriesBuilder_ == null) { entries_ = java.util.Collections.emptyList(); } else { @@ -1239,7 +1252,15 @@ public com.google.bigtable.v2.MutateRowsResponse build() { public com.google.bigtable.v2.MutateRowsResponse buildPartial() { com.google.bigtable.v2.MutateRowsResponse result = new com.google.bigtable.v2.MutateRowsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.bigtable.v2.MutateRowsResponse result) { if (entriesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { entries_ = java.util.Collections.unmodifiableList(entries_); @@ -1249,8 +1270,10 @@ public com.google.bigtable.v2.MutateRowsResponse buildPartial() { } else { result.entries_ = entriesBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.MutateRowsResponse result) { + int from_bitField0_ = bitField0_; } @java.lang.Override diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java index 177339dfa8..f36230b38f 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java @@ -191,7 +191,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int FAMILY_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object familyName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object familyName_ = ""; /** * * @@ -242,7 +244,7 @@ public com.google.protobuf.ByteString getFamilyNameBytes() { } public static final int COLUMN_QUALIFIER_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString columnQualifier_; + private com.google.protobuf.ByteString columnQualifier_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -261,7 +263,7 @@ public com.google.protobuf.ByteString getColumnQualifier() { } public static final int TIMESTAMP_MICROS_FIELD_NUMBER = 3; - private long timestampMicros_; + private long timestampMicros_ = 0L; /** * * @@ -283,7 +285,7 @@ public long getTimestampMicros() { } public static final int VALUE_FIELD_NUMBER = 4; - private com.google.protobuf.ByteString value_; + private com.google.protobuf.ByteString value_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -525,14 +527,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; familyName_ = ""; - columnQualifier_ = com.google.protobuf.ByteString.EMPTY; - timestampMicros_ = 0L; - value_ = com.google.protobuf.ByteString.EMPTY; - return this; } @@ -560,14 +559,29 @@ public com.google.bigtable.v2.Mutation.SetCell build() { public com.google.bigtable.v2.Mutation.SetCell buildPartial() { com.google.bigtable.v2.Mutation.SetCell result = new com.google.bigtable.v2.Mutation.SetCell(this); - result.familyName_ = familyName_; - result.columnQualifier_ = columnQualifier_; - result.timestampMicros_ = timestampMicros_; - result.value_ = value_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.Mutation.SetCell result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.familyName_ = familyName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.columnQualifier_ = columnQualifier_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.timestampMicros_ = timestampMicros_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.value_ = value_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -617,6 +631,7 @@ public Builder mergeFrom(com.google.bigtable.v2.Mutation.SetCell other) { if (other == com.google.bigtable.v2.Mutation.SetCell.getDefaultInstance()) return this; if (!other.getFamilyName().isEmpty()) { familyName_ = other.familyName_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getColumnQualifier() != com.google.protobuf.ByteString.EMPTY) { @@ -657,25 +672,25 @@ public Builder mergeFrom( case 10: { familyName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { columnQualifier_ = input.readBytes(); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { timestampMicros_ = input.readInt64(); - + bitField0_ |= 0x00000004; break; } // case 24 case 34: { value_ = input.readBytes(); - + bitField0_ |= 0x00000008; break; } // case 34 default: @@ -695,6 +710,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object familyName_ = ""; /** * @@ -759,8 +776,8 @@ public Builder setFamilyName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - familyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -777,8 +794,8 @@ public Builder setFamilyName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFamilyName() { - familyName_ = getDefaultInstance().getFamilyName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -800,8 +817,8 @@ public Builder setFamilyNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - familyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -841,8 +858,8 @@ public Builder setColumnQualifier(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - columnQualifier_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -859,7 +876,7 @@ public Builder setColumnQualifier(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearColumnQualifier() { - + bitField0_ = (bitField0_ & ~0x00000002); columnQualifier_ = getDefaultInstance().getColumnQualifier(); onChanged(); return this; @@ -904,6 +921,7 @@ public long getTimestampMicros() { public Builder setTimestampMicros(long value) { timestampMicros_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -923,7 +941,7 @@ public Builder setTimestampMicros(long value) { * @return This builder for chaining. */ public Builder clearTimestampMicros() { - + bitField0_ = (bitField0_ & ~0x00000004); timestampMicros_ = 0L; onChanged(); return this; @@ -961,8 +979,8 @@ public Builder setValue(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - value_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -978,7 +996,7 @@ public Builder setValue(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearValue() { - + bitField0_ = (bitField0_ & ~0x00000008); value_ = getDefaultInstance().getValue(); onChanged(); return this; @@ -1181,7 +1199,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int FAMILY_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object familyName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object familyName_ = ""; /** * * @@ -1232,7 +1252,7 @@ public com.google.protobuf.ByteString getFamilyNameBytes() { } public static final int COLUMN_QUALIFIER_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString columnQualifier_; + private com.google.protobuf.ByteString columnQualifier_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -1295,7 +1315,9 @@ public com.google.bigtable.v2.TimestampRange getTimeRange() { */ @java.lang.Override public com.google.bigtable.v2.TimestampRangeOrBuilder getTimeRangeOrBuilder() { - return getTimeRange(); + return timeRange_ == null + ? com.google.bigtable.v2.TimestampRange.getDefaultInstance() + : timeRange_; } private byte memoizedIsInitialized = -1; @@ -1521,14 +1543,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; familyName_ = ""; - columnQualifier_ = com.google.protobuf.ByteString.EMPTY; - - if (timeRangeBuilder_ == null) { - timeRange_ = null; - } else { - timeRange_ = null; + timeRange_ = null; + if (timeRangeBuilder_ != null) { + timeRangeBuilder_.dispose(); timeRangeBuilder_ = null; } return this; @@ -1558,17 +1578,26 @@ public com.google.bigtable.v2.Mutation.DeleteFromColumn build() { public com.google.bigtable.v2.Mutation.DeleteFromColumn buildPartial() { com.google.bigtable.v2.Mutation.DeleteFromColumn result = new com.google.bigtable.v2.Mutation.DeleteFromColumn(this); - result.familyName_ = familyName_; - result.columnQualifier_ = columnQualifier_; - if (timeRangeBuilder_ == null) { - result.timeRange_ = timeRange_; - } else { - result.timeRange_ = timeRangeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.Mutation.DeleteFromColumn result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.familyName_ = familyName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.columnQualifier_ = columnQualifier_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.timeRange_ = timeRangeBuilder_ == null ? timeRange_ : timeRangeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1619,6 +1648,7 @@ public Builder mergeFrom(com.google.bigtable.v2.Mutation.DeleteFromColumn other) return this; if (!other.getFamilyName().isEmpty()) { familyName_ = other.familyName_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getColumnQualifier() != com.google.protobuf.ByteString.EMPTY) { @@ -1656,19 +1686,19 @@ public Builder mergeFrom( case 10: { familyName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { columnQualifier_ = input.readBytes(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getTimeRangeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -1688,6 +1718,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object familyName_ = ""; /** * @@ -1752,8 +1784,8 @@ public Builder setFamilyName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - familyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1770,8 +1802,8 @@ public Builder setFamilyName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFamilyName() { - familyName_ = getDefaultInstance().getFamilyName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1793,8 +1825,8 @@ public Builder setFamilyNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - familyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1834,8 +1866,8 @@ public Builder setColumnQualifier(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - columnQualifier_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1852,7 +1884,7 @@ public Builder setColumnQualifier(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearColumnQualifier() { - + bitField0_ = (bitField0_ & ~0x00000002); columnQualifier_ = getDefaultInstance().getColumnQualifier(); onChanged(); return this; @@ -1876,7 +1908,7 @@ public Builder clearColumnQualifier() { * @return Whether the timeRange field is set. */ public boolean hasTimeRange() { - return timeRangeBuilder_ != null || timeRange_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1913,11 +1945,11 @@ public Builder setTimeRange(com.google.bigtable.v2.TimestampRange value) { throw new NullPointerException(); } timeRange_ = value; - onChanged(); } else { timeRangeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1932,11 +1964,11 @@ public Builder setTimeRange(com.google.bigtable.v2.TimestampRange value) { public Builder setTimeRange(com.google.bigtable.v2.TimestampRange.Builder builderForValue) { if (timeRangeBuilder_ == null) { timeRange_ = builderForValue.build(); - onChanged(); } else { timeRangeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1950,19 +1982,18 @@ public Builder setTimeRange(com.google.bigtable.v2.TimestampRange.Builder builde */ public Builder mergeTimeRange(com.google.bigtable.v2.TimestampRange value) { if (timeRangeBuilder_ == null) { - if (timeRange_ != null) { - timeRange_ = - com.google.bigtable.v2.TimestampRange.newBuilder(timeRange_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && timeRange_ != null + && timeRange_ != com.google.bigtable.v2.TimestampRange.getDefaultInstance()) { + getTimeRangeBuilder().mergeFrom(value); } else { timeRange_ = value; } - onChanged(); } else { timeRangeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1975,14 +2006,13 @@ public Builder mergeTimeRange(com.google.bigtable.v2.TimestampRange value) { * .google.bigtable.v2.TimestampRange time_range = 3; */ public Builder clearTimeRange() { - if (timeRangeBuilder_ == null) { - timeRange_ = null; - onChanged(); - } else { - timeRange_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + timeRange_ = null; + if (timeRangeBuilder_ != null) { + timeRangeBuilder_.dispose(); timeRangeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1995,7 +2025,7 @@ public Builder clearTimeRange() { * .google.bigtable.v2.TimestampRange time_range = 3; */ public com.google.bigtable.v2.TimestampRange.Builder getTimeRangeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getTimeRangeFieldBuilder().getBuilder(); } @@ -2189,7 +2219,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int FAMILY_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object familyName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object familyName_ = ""; /** * * @@ -2438,8 +2470,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; familyName_ = ""; - return this; } @@ -2467,11 +2499,20 @@ public com.google.bigtable.v2.Mutation.DeleteFromFamily build() { public com.google.bigtable.v2.Mutation.DeleteFromFamily buildPartial() { com.google.bigtable.v2.Mutation.DeleteFromFamily result = new com.google.bigtable.v2.Mutation.DeleteFromFamily(this); - result.familyName_ = familyName_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.Mutation.DeleteFromFamily result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.familyName_ = familyName_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -2522,6 +2563,7 @@ public Builder mergeFrom(com.google.bigtable.v2.Mutation.DeleteFromFamily other) return this; if (!other.getFamilyName().isEmpty()) { familyName_ = other.familyName_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -2553,7 +2595,7 @@ public Builder mergeFrom( case 10: { familyName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -2573,6 +2615,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object familyName_ = ""; /** * @@ -2637,8 +2681,8 @@ public Builder setFamilyName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - familyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2655,8 +2699,8 @@ public Builder setFamilyName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFamilyName() { - familyName_ = getDefaultInstance().getFamilyName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -2678,8 +2722,8 @@ public Builder setFamilyNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - familyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3686,6 +3730,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (setCellBuilder_ != null) { setCellBuilder_.clear(); } @@ -3726,37 +3771,33 @@ public com.google.bigtable.v2.Mutation build() { @java.lang.Override public com.google.bigtable.v2.Mutation buildPartial() { com.google.bigtable.v2.Mutation result = new com.google.bigtable.v2.Mutation(this); - if (mutationCase_ == 1) { - if (setCellBuilder_ == null) { - result.mutation_ = mutation_; - } else { - result.mutation_ = setCellBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - if (mutationCase_ == 2) { - if (deleteFromColumnBuilder_ == null) { - result.mutation_ = mutation_; - } else { - result.mutation_ = deleteFromColumnBuilder_.build(); - } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartial0(com.google.bigtable.v2.Mutation result) { + int from_bitField0_ = bitField0_; + } + + private void buildPartialOneofs(com.google.bigtable.v2.Mutation result) { + result.mutationCase_ = mutationCase_; + result.mutation_ = this.mutation_; + if (mutationCase_ == 1 && setCellBuilder_ != null) { + result.mutation_ = setCellBuilder_.build(); } - if (mutationCase_ == 3) { - if (deleteFromFamilyBuilder_ == null) { - result.mutation_ = mutation_; - } else { - result.mutation_ = deleteFromFamilyBuilder_.build(); - } + if (mutationCase_ == 2 && deleteFromColumnBuilder_ != null) { + result.mutation_ = deleteFromColumnBuilder_.build(); } - if (mutationCase_ == 4) { - if (deleteFromRowBuilder_ == null) { - result.mutation_ = mutation_; - } else { - result.mutation_ = deleteFromRowBuilder_.build(); - } + if (mutationCase_ == 3 && deleteFromFamilyBuilder_ != null) { + result.mutation_ = deleteFromFamilyBuilder_.build(); + } + if (mutationCase_ == 4 && deleteFromRowBuilder_ != null) { + result.mutation_ = deleteFromRowBuilder_.build(); } - result.mutationCase_ = mutationCase_; - onBuilt(); - return result; } @java.lang.Override @@ -3913,6 +3954,8 @@ public Builder clearMutation() { return this; } + private int bitField0_; + private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.Mutation.SetCell, com.google.bigtable.v2.Mutation.SetCell.Builder, @@ -4118,7 +4161,6 @@ public com.google.bigtable.v2.Mutation.SetCellOrBuilder getSetCellOrBuilder() { } mutationCase_ = 1; onChanged(); - ; return setCellBuilder_; } @@ -4329,7 +4371,6 @@ public com.google.bigtable.v2.Mutation.DeleteFromColumn.Builder getDeleteFromCol } mutationCase_ = 2; onChanged(); - ; return deleteFromColumnBuilder_; } @@ -4540,7 +4581,6 @@ public com.google.bigtable.v2.Mutation.DeleteFromFamily.Builder getDeleteFromFam } mutationCase_ = 3; onChanged(); - ; return deleteFromFamilyBuilder_; } @@ -4750,7 +4790,6 @@ public com.google.bigtable.v2.Mutation.DeleteFromRowOrBuilder getDeleteFromRowOr } mutationCase_ = 4; onChanged(); - ; return deleteFromRowBuilder_; } diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/PingAndWarmRequest.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/PingAndWarmRequest.java index 03d0839d7c..bb31d1aaa0 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/PingAndWarmRequest.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/PingAndWarmRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -124,7 +126,9 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int APP_PROFILE_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object appProfileId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object appProfileId_ = ""; /** * * @@ -380,10 +384,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - appProfileId_ = ""; - return this; } @@ -411,12 +414,23 @@ public com.google.bigtable.v2.PingAndWarmRequest build() { public com.google.bigtable.v2.PingAndWarmRequest buildPartial() { com.google.bigtable.v2.PingAndWarmRequest result = new com.google.bigtable.v2.PingAndWarmRequest(this); - result.name_ = name_; - result.appProfileId_ = appProfileId_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.PingAndWarmRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.appProfileId_ = appProfileId_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -464,10 +478,12 @@ public Builder mergeFrom(com.google.bigtable.v2.PingAndWarmRequest other) { if (other == com.google.bigtable.v2.PingAndWarmRequest.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getAppProfileId().isEmpty()) { appProfileId_ = other.appProfileId_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -499,13 +515,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { appProfileId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -525,6 +541,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -595,8 +613,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -615,8 +633,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -640,8 +658,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -710,8 +728,8 @@ public Builder setAppProfileId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -728,8 +746,8 @@ public Builder setAppProfileId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAppProfileId() { - appProfileId_ = getDefaultInstance().getAppProfileId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -751,8 +769,8 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadIterationStats.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadIterationStats.java index 26955faba7..16ce6e230a 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadIterationStats.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadIterationStats.java @@ -68,7 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ROWS_SEEN_COUNT_FIELD_NUMBER = 1; - private long rowsSeenCount_; + private long rowsSeenCount_ = 0L; /** * * @@ -87,7 +87,7 @@ public long getRowsSeenCount() { } public static final int ROWS_RETURNED_COUNT_FIELD_NUMBER = 2; - private long rowsReturnedCount_; + private long rowsReturnedCount_ = 0L; /** * * @@ -105,7 +105,7 @@ public long getRowsReturnedCount() { } public static final int CELLS_SEEN_COUNT_FIELD_NUMBER = 3; - private long cellsSeenCount_; + private long cellsSeenCount_ = 0L; /** * * @@ -124,7 +124,7 @@ public long getCellsSeenCount() { } public static final int CELLS_RETURNED_COUNT_FIELD_NUMBER = 4; - private long cellsReturnedCount_; + private long cellsReturnedCount_ = 0L; /** * * @@ -367,14 +367,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; rowsSeenCount_ = 0L; - rowsReturnedCount_ = 0L; - cellsSeenCount_ = 0L; - cellsReturnedCount_ = 0L; - return this; } @@ -402,14 +399,29 @@ public com.google.bigtable.v2.ReadIterationStats build() { public com.google.bigtable.v2.ReadIterationStats buildPartial() { com.google.bigtable.v2.ReadIterationStats result = new com.google.bigtable.v2.ReadIterationStats(this); - result.rowsSeenCount_ = rowsSeenCount_; - result.rowsReturnedCount_ = rowsReturnedCount_; - result.cellsSeenCount_ = cellsSeenCount_; - result.cellsReturnedCount_ = cellsReturnedCount_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.ReadIterationStats result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.rowsSeenCount_ = rowsSeenCount_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.rowsReturnedCount_ = rowsReturnedCount_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.cellsSeenCount_ = cellsSeenCount_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.cellsReturnedCount_ = cellsReturnedCount_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -496,25 +508,25 @@ public Builder mergeFrom( case 8: { rowsSeenCount_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 case 16: { rowsReturnedCount_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 case 24: { cellsSeenCount_ = input.readInt64(); - + bitField0_ |= 0x00000004; break; } // case 24 case 32: { cellsReturnedCount_ = input.readInt64(); - + bitField0_ |= 0x00000008; break; } // case 32 default: @@ -534,6 +546,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private long rowsSeenCount_; /** * @@ -567,6 +581,7 @@ public long getRowsSeenCount() { public Builder setRowsSeenCount(long value) { rowsSeenCount_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -583,7 +598,7 @@ public Builder setRowsSeenCount(long value) { * @return This builder for chaining. */ public Builder clearRowsSeenCount() { - + bitField0_ = (bitField0_ & ~0x00000001); rowsSeenCount_ = 0L; onChanged(); return this; @@ -620,6 +635,7 @@ public long getRowsReturnedCount() { public Builder setRowsReturnedCount(long value) { rowsReturnedCount_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -635,7 +651,7 @@ public Builder setRowsReturnedCount(long value) { * @return This builder for chaining. */ public Builder clearRowsReturnedCount() { - + bitField0_ = (bitField0_ & ~0x00000002); rowsReturnedCount_ = 0L; onChanged(); return this; @@ -674,6 +690,7 @@ public long getCellsSeenCount() { public Builder setCellsSeenCount(long value) { cellsSeenCount_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -690,7 +707,7 @@ public Builder setCellsSeenCount(long value) { * @return This builder for chaining. */ public Builder clearCellsSeenCount() { - + bitField0_ = (bitField0_ & ~0x00000004); cellsSeenCount_ = 0L; onChanged(); return this; @@ -727,6 +744,7 @@ public long getCellsReturnedCount() { public Builder setCellsReturnedCount(long value) { cellsReturnedCount_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -742,7 +760,7 @@ public Builder setCellsReturnedCount(long value) { * @return This builder for chaining. */ public Builder clearCellsReturnedCount() { - + bitField0_ = (bitField0_ & ~0x00000008); cellsReturnedCount_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java index 9bd7eef837..f440573d99 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java @@ -71,7 +71,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int TABLE_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object tableName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object tableName_ = ""; /** * * @@ -130,7 +132,9 @@ public com.google.protobuf.ByteString getTableNameBytes() { } public static final int APP_PROFILE_ID_FIELD_NUMBER = 4; - private volatile java.lang.Object appProfileId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object appProfileId_ = ""; /** * * @@ -181,7 +185,7 @@ public com.google.protobuf.ByteString getAppProfileIdBytes() { } public static final int ROW_KEY_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString rowKey_; + private com.google.protobuf.ByteString rowKey_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -199,6 +203,8 @@ public com.google.protobuf.ByteString getRowKey() { } public static final int RULES_FIELD_NUMBER = 3; + + @SuppressWarnings("serial") private java.util.List rules_; /** * @@ -513,19 +519,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; tableName_ = ""; - appProfileId_ = ""; - rowKey_ = com.google.protobuf.ByteString.EMPTY; - if (rulesBuilder_ == null) { rules_ = java.util.Collections.emptyList(); } else { rules_ = null; rulesBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -553,21 +557,38 @@ public com.google.bigtable.v2.ReadModifyWriteRowRequest build() { public com.google.bigtable.v2.ReadModifyWriteRowRequest buildPartial() { com.google.bigtable.v2.ReadModifyWriteRowRequest result = new com.google.bigtable.v2.ReadModifyWriteRowRequest(this); - int from_bitField0_ = bitField0_; - result.tableName_ = tableName_; - result.appProfileId_ = appProfileId_; - result.rowKey_ = rowKey_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.v2.ReadModifyWriteRowRequest result) { if (rulesBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000008) != 0)) { rules_ = java.util.Collections.unmodifiableList(rules_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } result.rules_ = rules_; } else { result.rules_ = rulesBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.ReadModifyWriteRowRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.tableName_ = tableName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.appProfileId_ = appProfileId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.rowKey_ = rowKey_; + } } @java.lang.Override @@ -618,10 +639,12 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadModifyWriteRowRequest other) return this; if (!other.getTableName().isEmpty()) { tableName_ = other.tableName_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getAppProfileId().isEmpty()) { appProfileId_ = other.appProfileId_; + bitField0_ |= 0x00000002; onChanged(); } if (other.getRowKey() != com.google.protobuf.ByteString.EMPTY) { @@ -631,7 +654,7 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadModifyWriteRowRequest other) if (!other.rules_.isEmpty()) { if (rules_.isEmpty()) { rules_ = other.rules_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureRulesIsMutable(); rules_.addAll(other.rules_); @@ -644,7 +667,7 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadModifyWriteRowRequest other) rulesBuilder_.dispose(); rulesBuilder_ = null; rules_ = other.rules_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); rulesBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getRulesFieldBuilder() @@ -683,13 +706,13 @@ public Builder mergeFrom( case 10: { tableName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { rowKey_ = input.readBytes(); - + bitField0_ |= 0x00000004; break; } // case 18 case 26: @@ -708,7 +731,7 @@ public Builder mergeFrom( case 34: { appProfileId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 34 default: @@ -806,8 +829,8 @@ public Builder setTableName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -828,8 +851,8 @@ public Builder setTableName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTableName() { - tableName_ = getDefaultInstance().getTableName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -855,8 +878,8 @@ public Builder setTableNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -925,8 +948,8 @@ public Builder setAppProfileId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -943,8 +966,8 @@ public Builder setAppProfileId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAppProfileId() { - appProfileId_ = getDefaultInstance().getAppProfileId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -966,8 +989,8 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1004,8 +1027,8 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - rowKey_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1021,7 +1044,7 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearRowKey() { - + bitField0_ = (bitField0_ & ~0x00000004); rowKey_ = getDefaultInstance().getRowKey(); onChanged(); return this; @@ -1031,9 +1054,9 @@ public Builder clearRowKey() { java.util.Collections.emptyList(); private void ensureRulesIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000008) != 0)) { rules_ = new java.util.ArrayList(rules_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000008; } } @@ -1292,7 +1315,7 @@ public Builder addAllRules( public Builder clearRules() { if (rulesBuilder_ == null) { rules_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { rulesBuilder_.clear(); @@ -1442,7 +1465,7 @@ public com.google.bigtable.v2.ReadModifyWriteRule.Builder addRulesBuilder(int in com.google.bigtable.v2.ReadModifyWriteRule, com.google.bigtable.v2.ReadModifyWriteRule.Builder, com.google.bigtable.v2.ReadModifyWriteRuleOrBuilder>( - rules_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + rules_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); rules_ = null; } return rulesBuilder_; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java index e79c933d51..c684f98dfa 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java @@ -108,7 +108,7 @@ public com.google.bigtable.v2.Row getRow() { */ @java.lang.Override public com.google.bigtable.v2.RowOrBuilder getRowOrBuilder() { - return getRow(); + return row_ == null ? com.google.bigtable.v2.Row.getDefaultInstance() : row_; } private byte memoizedIsInitialized = -1; @@ -313,10 +313,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (rowBuilder_ == null) { - row_ = null; - } else { - row_ = null; + bitField0_ = 0; + row_ = null; + if (rowBuilder_ != null) { + rowBuilder_.dispose(); rowBuilder_ = null; } return this; @@ -346,15 +346,20 @@ public com.google.bigtable.v2.ReadModifyWriteRowResponse build() { public com.google.bigtable.v2.ReadModifyWriteRowResponse buildPartial() { com.google.bigtable.v2.ReadModifyWriteRowResponse result = new com.google.bigtable.v2.ReadModifyWriteRowResponse(this); - if (rowBuilder_ == null) { - result.row_ = row_; - } else { - result.row_ = rowBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.ReadModifyWriteRowResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.row_ = rowBuilder_ == null ? row_ : rowBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -433,7 +438,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getRowFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -453,6 +458,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.v2.Row row_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.Row, @@ -471,7 +478,7 @@ public Builder mergeFrom( * @return Whether the row field is set. */ public boolean hasRow() { - return rowBuilder_ != null || row_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -506,11 +513,11 @@ public Builder setRow(com.google.bigtable.v2.Row value) { throw new NullPointerException(); } row_ = value; - onChanged(); } else { rowBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -525,11 +532,11 @@ public Builder setRow(com.google.bigtable.v2.Row value) { public Builder setRow(com.google.bigtable.v2.Row.Builder builderForValue) { if (rowBuilder_ == null) { row_ = builderForValue.build(); - onChanged(); } else { rowBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -543,16 +550,18 @@ public Builder setRow(com.google.bigtable.v2.Row.Builder builderForValue) { */ public Builder mergeRow(com.google.bigtable.v2.Row value) { if (rowBuilder_ == null) { - if (row_ != null) { - row_ = com.google.bigtable.v2.Row.newBuilder(row_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && row_ != null + && row_ != com.google.bigtable.v2.Row.getDefaultInstance()) { + getRowBuilder().mergeFrom(value); } else { row_ = value; } - onChanged(); } else { rowBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -565,14 +574,13 @@ public Builder mergeRow(com.google.bigtable.v2.Row value) { * .google.bigtable.v2.Row row = 1; */ public Builder clearRow() { - if (rowBuilder_ == null) { - row_ = null; - onChanged(); - } else { - row_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + row_ = null; + if (rowBuilder_ != null) { + rowBuilder_.dispose(); rowBuilder_ = null; } - + onChanged(); return this; } /** @@ -585,7 +593,7 @@ public Builder clearRow() { * .google.bigtable.v2.Row row = 1; */ public com.google.bigtable.v2.Row.Builder getRowBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getRowFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java index a02ecbb670..37d54bf912 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java @@ -117,7 +117,9 @@ public RuleCase getRuleCase() { } public static final int FAMILY_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object familyName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object familyName_ = ""; /** * * @@ -168,7 +170,7 @@ public com.google.protobuf.ByteString getFamilyNameBytes() { } public static final int COLUMN_QUALIFIER_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString columnQualifier_; + private com.google.protobuf.ByteString columnQualifier_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -513,10 +515,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; familyName_ = ""; - columnQualifier_ = com.google.protobuf.ByteString.EMPTY; - ruleCase_ = 0; rule_ = null; return this; @@ -546,19 +547,29 @@ public com.google.bigtable.v2.ReadModifyWriteRule build() { public com.google.bigtable.v2.ReadModifyWriteRule buildPartial() { com.google.bigtable.v2.ReadModifyWriteRule result = new com.google.bigtable.v2.ReadModifyWriteRule(this); - result.familyName_ = familyName_; - result.columnQualifier_ = columnQualifier_; - if (ruleCase_ == 3) { - result.rule_ = rule_; - } - if (ruleCase_ == 4) { - result.rule_ = rule_; + if (bitField0_ != 0) { + buildPartial0(result); } - result.ruleCase_ = ruleCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.ReadModifyWriteRule result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.familyName_ = familyName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.columnQualifier_ = columnQualifier_; + } + } + + private void buildPartialOneofs(com.google.bigtable.v2.ReadModifyWriteRule result) { + result.ruleCase_ = ruleCase_; + result.rule_ = this.rule_; + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -606,6 +617,7 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadModifyWriteRule other) { if (other == com.google.bigtable.v2.ReadModifyWriteRule.getDefaultInstance()) return this; if (!other.getFamilyName().isEmpty()) { familyName_ = other.familyName_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getColumnQualifier() != com.google.protobuf.ByteString.EMPTY) { @@ -656,13 +668,13 @@ public Builder mergeFrom( case 10: { familyName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { columnQualifier_ = input.readBytes(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: @@ -708,6 +720,8 @@ public Builder clearRule() { return this; } + private int bitField0_; + private java.lang.Object familyName_ = ""; /** * @@ -772,8 +786,8 @@ public Builder setFamilyName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - familyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -790,8 +804,8 @@ public Builder setFamilyName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearFamilyName() { - familyName_ = getDefaultInstance().getFamilyName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -813,8 +827,8 @@ public Builder setFamilyNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - familyName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -855,8 +869,8 @@ public Builder setColumnQualifier(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - columnQualifier_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -874,7 +888,7 @@ public Builder setColumnQualifier(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearColumnQualifier() { - + bitField0_ = (bitField0_ & ~0x00000002); columnQualifier_ = getDefaultInstance().getColumnQualifier(); onChanged(); return this; @@ -1013,6 +1027,7 @@ public long getIncrementAmount() { * @return This builder for chaining. */ public Builder setIncrementAmount(long value) { + ruleCase_ = 4; rule_ = value; onChanged(); diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java index bb9349047c..00e8124f77 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java @@ -234,7 +234,9 @@ private RequestStatsView(int value) { } public static final int TABLE_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object tableName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object tableName_ = ""; /** * * @@ -291,7 +293,9 @@ public com.google.protobuf.ByteString getTableNameBytes() { } public static final int APP_PROFILE_ID_FIELD_NUMBER = 5; - private volatile java.lang.Object appProfileId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object appProfileId_ = ""; /** * * @@ -387,7 +391,7 @@ public com.google.bigtable.v2.RowSet getRows() { */ @java.lang.Override public com.google.bigtable.v2.RowSetOrBuilder getRowsOrBuilder() { - return getRows(); + return rows_ == null ? com.google.bigtable.v2.RowSet.getDefaultInstance() : rows_; } public static final int FILTER_FIELD_NUMBER = 3; @@ -436,11 +440,11 @@ public com.google.bigtable.v2.RowFilter getFilter() { */ @java.lang.Override public com.google.bigtable.v2.RowFilterOrBuilder getFilterOrBuilder() { - return getFilter(); + return filter_ == null ? com.google.bigtable.v2.RowFilter.getDefaultInstance() : filter_; } public static final int ROWS_LIMIT_FIELD_NUMBER = 4; - private long rowsLimit_; + private long rowsLimit_ = 0L; /** * * @@ -459,7 +463,7 @@ public long getRowsLimit() { } public static final int REQUEST_STATS_VIEW_FIELD_NUMBER = 6; - private int requestStatsView_; + private int requestStatsView_ = 0; /** * * @@ -488,9 +492,8 @@ public int getRequestStatsViewValue() { */ @java.lang.Override public com.google.bigtable.v2.ReadRowsRequest.RequestStatsView getRequestStatsView() { - @SuppressWarnings("deprecation") com.google.bigtable.v2.ReadRowsRequest.RequestStatsView result = - com.google.bigtable.v2.ReadRowsRequest.RequestStatsView.valueOf(requestStatsView_); + com.google.bigtable.v2.ReadRowsRequest.RequestStatsView.forNumber(requestStatsView_); return result == null ? com.google.bigtable.v2.ReadRowsRequest.RequestStatsView.UNRECOGNIZED : result; @@ -751,26 +754,21 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; tableName_ = ""; - appProfileId_ = ""; - - if (rowsBuilder_ == null) { - rows_ = null; - } else { - rows_ = null; + rows_ = null; + if (rowsBuilder_ != null) { + rowsBuilder_.dispose(); rowsBuilder_ = null; } - if (filterBuilder_ == null) { - filter_ = null; - } else { - filter_ = null; + filter_ = null; + if (filterBuilder_ != null) { + filterBuilder_.dispose(); filterBuilder_ = null; } rowsLimit_ = 0L; - requestStatsView_ = 0; - return this; } @@ -798,24 +796,35 @@ public com.google.bigtable.v2.ReadRowsRequest build() { public com.google.bigtable.v2.ReadRowsRequest buildPartial() { com.google.bigtable.v2.ReadRowsRequest result = new com.google.bigtable.v2.ReadRowsRequest(this); - result.tableName_ = tableName_; - result.appProfileId_ = appProfileId_; - if (rowsBuilder_ == null) { - result.rows_ = rows_; - } else { - result.rows_ = rowsBuilder_.build(); - } - if (filterBuilder_ == null) { - result.filter_ = filter_; - } else { - result.filter_ = filterBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.rowsLimit_ = rowsLimit_; - result.requestStatsView_ = requestStatsView_; onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.ReadRowsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.tableName_ = tableName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.appProfileId_ = appProfileId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.rows_ = rowsBuilder_ == null ? rows_ : rowsBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.filter_ = filterBuilder_ == null ? filter_ : filterBuilder_.build(); + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.rowsLimit_ = rowsLimit_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.requestStatsView_ = requestStatsView_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -863,10 +872,12 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadRowsRequest other) { if (other == com.google.bigtable.v2.ReadRowsRequest.getDefaultInstance()) return this; if (!other.getTableName().isEmpty()) { tableName_ = other.tableName_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getAppProfileId().isEmpty()) { appProfileId_ = other.appProfileId_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasRows()) { @@ -910,37 +921,37 @@ public Builder mergeFrom( case 10: { tableName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getRowsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 18 case 26: { input.readMessage(getFilterFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 26 case 32: { rowsLimit_ = input.readInt64(); - + bitField0_ |= 0x00000010; break; } // case 32 case 42: { appProfileId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 42 case 48: { requestStatsView_ = input.readEnum(); - + bitField0_ |= 0x00000020; break; } // case 48 default: @@ -960,6 +971,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object tableName_ = ""; /** * @@ -1033,8 +1046,8 @@ public Builder setTableName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1054,8 +1067,8 @@ public Builder setTableName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTableName() { - tableName_ = getDefaultInstance().getTableName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1080,8 +1093,8 @@ public Builder setTableNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1150,8 +1163,8 @@ public Builder setAppProfileId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1168,8 +1181,8 @@ public Builder setAppProfileId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAppProfileId() { - appProfileId_ = getDefaultInstance().getAppProfileId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1191,8 +1204,8 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1216,7 +1229,7 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { * @return Whether the rows field is set. */ public boolean hasRows() { - return rowsBuilder_ != null || rows_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1253,11 +1266,11 @@ public Builder setRows(com.google.bigtable.v2.RowSet value) { throw new NullPointerException(); } rows_ = value; - onChanged(); } else { rowsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1273,11 +1286,11 @@ public Builder setRows(com.google.bigtable.v2.RowSet value) { public Builder setRows(com.google.bigtable.v2.RowSet.Builder builderForValue) { if (rowsBuilder_ == null) { rows_ = builderForValue.build(); - onChanged(); } else { rowsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1292,16 +1305,18 @@ public Builder setRows(com.google.bigtable.v2.RowSet.Builder builderForValue) { */ public Builder mergeRows(com.google.bigtable.v2.RowSet value) { if (rowsBuilder_ == null) { - if (rows_ != null) { - rows_ = com.google.bigtable.v2.RowSet.newBuilder(rows_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && rows_ != null + && rows_ != com.google.bigtable.v2.RowSet.getDefaultInstance()) { + getRowsBuilder().mergeFrom(value); } else { rows_ = value; } - onChanged(); } else { rowsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1315,14 +1330,13 @@ public Builder mergeRows(com.google.bigtable.v2.RowSet value) { * .google.bigtable.v2.RowSet rows = 2; */ public Builder clearRows() { - if (rowsBuilder_ == null) { - rows_ = null; - onChanged(); - } else { - rows_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + rows_ = null; + if (rowsBuilder_ != null) { + rowsBuilder_.dispose(); rowsBuilder_ = null; } - + onChanged(); return this; } /** @@ -1336,7 +1350,7 @@ public Builder clearRows() { * .google.bigtable.v2.RowSet rows = 2; */ public com.google.bigtable.v2.RowSet.Builder getRowsBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getRowsFieldBuilder().getBuilder(); } @@ -1403,7 +1417,7 @@ public com.google.bigtable.v2.RowSetOrBuilder getRowsOrBuilder() { * @return Whether the filter field is set. */ public boolean hasFilter() { - return filterBuilder_ != null || filter_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1440,11 +1454,11 @@ public Builder setFilter(com.google.bigtable.v2.RowFilter value) { throw new NullPointerException(); } filter_ = value; - onChanged(); } else { filterBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1460,11 +1474,11 @@ public Builder setFilter(com.google.bigtable.v2.RowFilter value) { public Builder setFilter(com.google.bigtable.v2.RowFilter.Builder builderForValue) { if (filterBuilder_ == null) { filter_ = builderForValue.build(); - onChanged(); } else { filterBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1479,17 +1493,18 @@ public Builder setFilter(com.google.bigtable.v2.RowFilter.Builder builderForValu */ public Builder mergeFilter(com.google.bigtable.v2.RowFilter value) { if (filterBuilder_ == null) { - if (filter_ != null) { - filter_ = - com.google.bigtable.v2.RowFilter.newBuilder(filter_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && filter_ != null + && filter_ != com.google.bigtable.v2.RowFilter.getDefaultInstance()) { + getFilterBuilder().mergeFrom(value); } else { filter_ = value; } - onChanged(); } else { filterBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1503,14 +1518,13 @@ public Builder mergeFilter(com.google.bigtable.v2.RowFilter value) { * .google.bigtable.v2.RowFilter filter = 3; */ public Builder clearFilter() { - if (filterBuilder_ == null) { - filter_ = null; - onChanged(); - } else { - filter_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + filter_ = null; + if (filterBuilder_ != null) { + filterBuilder_.dispose(); filterBuilder_ = null; } - + onChanged(); return this; } /** @@ -1524,7 +1538,7 @@ public Builder clearFilter() { * .google.bigtable.v2.RowFilter filter = 3; */ public com.google.bigtable.v2.RowFilter.Builder getFilterBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getFilterFieldBuilder().getBuilder(); } @@ -1605,6 +1619,7 @@ public long getRowsLimit() { public Builder setRowsLimit(long value) { rowsLimit_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -1621,7 +1636,7 @@ public Builder setRowsLimit(long value) { * @return This builder for chaining. */ public Builder clearRowsLimit() { - + bitField0_ = (bitField0_ & ~0x00000010); rowsLimit_ = 0L; onChanged(); return this; @@ -1656,8 +1671,8 @@ public int getRequestStatsViewValue() { * @return This builder for chaining. */ public Builder setRequestStatsViewValue(int value) { - requestStatsView_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -1674,9 +1689,8 @@ public Builder setRequestStatsViewValue(int value) { */ @java.lang.Override public com.google.bigtable.v2.ReadRowsRequest.RequestStatsView getRequestStatsView() { - @SuppressWarnings("deprecation") com.google.bigtable.v2.ReadRowsRequest.RequestStatsView result = - com.google.bigtable.v2.ReadRowsRequest.RequestStatsView.valueOf(requestStatsView_); + com.google.bigtable.v2.ReadRowsRequest.RequestStatsView.forNumber(requestStatsView_); return result == null ? com.google.bigtable.v2.ReadRowsRequest.RequestStatsView.UNRECOGNIZED : result; @@ -1698,7 +1712,7 @@ public Builder setRequestStatsView( if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000020; requestStatsView_ = value.getNumber(); onChanged(); return this; @@ -1715,7 +1729,7 @@ public Builder setRequestStatsView( * @return This builder for chaining. */ public Builder clearRequestStatsView() { - + bitField0_ = (bitField0_ & ~0x00000020); requestStatsView_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java index 2de28f715e..71509e1bda 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java @@ -454,7 +454,7 @@ public RowStatusCase getRowStatusCase() { } public static final int ROW_KEY_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString rowKey_; + private com.google.protobuf.ByteString rowKey_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -534,7 +534,9 @@ public com.google.protobuf.StringValue getFamilyName() { */ @java.lang.Override public com.google.protobuf.StringValueOrBuilder getFamilyNameOrBuilder() { - return getFamilyName(); + return familyName_ == null + ? com.google.protobuf.StringValue.getDefaultInstance() + : familyName_; } public static final int QUALIFIER_FIELD_NUMBER = 3; @@ -592,11 +594,11 @@ public com.google.protobuf.BytesValue getQualifier() { */ @java.lang.Override public com.google.protobuf.BytesValueOrBuilder getQualifierOrBuilder() { - return getQualifier(); + return qualifier_ == null ? com.google.protobuf.BytesValue.getDefaultInstance() : qualifier_; } public static final int TIMESTAMP_MICROS_FIELD_NUMBER = 4; - private long timestampMicros_; + private long timestampMicros_ = 0L; /** * * @@ -621,6 +623,8 @@ public long getTimestampMicros() { } public static final int LABELS_FIELD_NUMBER = 5; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList labels_; /** * @@ -690,7 +694,7 @@ public com.google.protobuf.ByteString getLabelsBytes(int index) { } public static final int VALUE_FIELD_NUMBER = 6; - private com.google.protobuf.ByteString value_; + private com.google.protobuf.ByteString value_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -712,7 +716,7 @@ public com.google.protobuf.ByteString getValue() { } public static final int VALUE_SIZE_FIELD_NUMBER = 7; - private int valueSize_; + private int valueSize_ = 0; /** * * @@ -1116,28 +1120,23 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; rowKey_ = com.google.protobuf.ByteString.EMPTY; - - if (familyNameBuilder_ == null) { - familyName_ = null; - } else { - familyName_ = null; + familyName_ = null; + if (familyNameBuilder_ != null) { + familyNameBuilder_.dispose(); familyNameBuilder_ = null; } - if (qualifierBuilder_ == null) { - qualifier_ = null; - } else { - qualifier_ = null; + qualifier_ = null; + if (qualifierBuilder_ != null) { + qualifierBuilder_.dispose(); qualifierBuilder_ = null; } timestampMicros_ = 0L; - labels_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); value_ = com.google.protobuf.ByteString.EMPTY; - valueSize_ = 0; - rowStatusCase_ = 0; rowStatus_ = null; return this; @@ -1167,35 +1166,50 @@ public com.google.bigtable.v2.ReadRowsResponse.CellChunk build() { public com.google.bigtable.v2.ReadRowsResponse.CellChunk buildPartial() { com.google.bigtable.v2.ReadRowsResponse.CellChunk result = new com.google.bigtable.v2.ReadRowsResponse.CellChunk(this); - int from_bitField0_ = bitField0_; - result.rowKey_ = rowKey_; - if (familyNameBuilder_ == null) { - result.familyName_ = familyName_; - } else { - result.familyName_ = familyNameBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } - if (qualifierBuilder_ == null) { - result.qualifier_ = qualifier_; - } else { - result.qualifier_ = qualifierBuilder_.build(); - } - result.timestampMicros_ = timestampMicros_; - if (((bitField0_ & 0x00000001) != 0)) { + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.bigtable.v2.ReadRowsResponse.CellChunk result) { + if (((bitField0_ & 0x00000010) != 0)) { labels_ = labels_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); } result.labels_ = labels_; - result.value_ = value_; - result.valueSize_ = valueSize_; - if (rowStatusCase_ == 8) { - result.rowStatus_ = rowStatus_; + } + + private void buildPartial0(com.google.bigtable.v2.ReadRowsResponse.CellChunk result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.rowKey_ = rowKey_; } - if (rowStatusCase_ == 9) { - result.rowStatus_ = rowStatus_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.familyName_ = + familyNameBuilder_ == null ? familyName_ : familyNameBuilder_.build(); } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.qualifier_ = qualifierBuilder_ == null ? qualifier_ : qualifierBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.timestampMicros_ = timestampMicros_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.value_ = value_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.valueSize_ = valueSize_; + } + } + + private void buildPartialOneofs(com.google.bigtable.v2.ReadRowsResponse.CellChunk result) { result.rowStatusCase_ = rowStatusCase_; - onBuilt(); - return result; + result.rowStatus_ = this.rowStatus_; } @java.lang.Override @@ -1261,7 +1275,7 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadRowsResponse.CellChunk other if (!other.labels_.isEmpty()) { if (labels_.isEmpty()) { labels_ = other.labels_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); } else { ensureLabelsIsMutable(); labels_.addAll(other.labels_); @@ -1319,25 +1333,25 @@ public Builder mergeFrom( case 10: { rowKey_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getFamilyNameFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getQualifierFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 32: { timestampMicros_ = input.readInt64(); - + bitField0_ |= 0x00000008; break; } // case 32 case 42: @@ -1350,13 +1364,13 @@ public Builder mergeFrom( case 50: { value_ = input.readBytes(); - + bitField0_ |= 0x00000020; break; } // case 50 case 56: { valueSize_ = input.readInt32(); - + bitField0_ |= 0x00000040; break; } // case 56 case 64: @@ -1442,8 +1456,8 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - rowKey_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1462,7 +1476,7 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearRowKey() { - + bitField0_ = (bitField0_ & ~0x00000001); rowKey_ = getDefaultInstance().getRowKey(); onChanged(); return this; @@ -1491,7 +1505,7 @@ public Builder clearRowKey() { * @return Whether the familyName field is set. */ public boolean hasFamilyName() { - return familyNameBuilder_ != null || familyName_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -1538,11 +1552,11 @@ public Builder setFamilyName(com.google.protobuf.StringValue value) { throw new NullPointerException(); } familyName_ = value; - onChanged(); } else { familyNameBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1562,11 +1576,11 @@ public Builder setFamilyName(com.google.protobuf.StringValue value) { public Builder setFamilyName(com.google.protobuf.StringValue.Builder builderForValue) { if (familyNameBuilder_ == null) { familyName_ = builderForValue.build(); - onChanged(); } else { familyNameBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1585,19 +1599,18 @@ public Builder setFamilyName(com.google.protobuf.StringValue.Builder builderForV */ public Builder mergeFamilyName(com.google.protobuf.StringValue value) { if (familyNameBuilder_ == null) { - if (familyName_ != null) { - familyName_ = - com.google.protobuf.StringValue.newBuilder(familyName_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && familyName_ != null + && familyName_ != com.google.protobuf.StringValue.getDefaultInstance()) { + getFamilyNameBuilder().mergeFrom(value); } else { familyName_ = value; } - onChanged(); } else { familyNameBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1615,14 +1628,13 @@ public Builder mergeFamilyName(com.google.protobuf.StringValue value) { * .google.protobuf.StringValue family_name = 2; */ public Builder clearFamilyName() { - if (familyNameBuilder_ == null) { - familyName_ = null; - onChanged(); - } else { - familyName_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + familyName_ = null; + if (familyNameBuilder_ != null) { + familyNameBuilder_.dispose(); familyNameBuilder_ = null; } - + onChanged(); return this; } /** @@ -1640,7 +1652,7 @@ public Builder clearFamilyName() { * .google.protobuf.StringValue family_name = 2; */ public com.google.protobuf.StringValue.Builder getFamilyNameBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getFamilyNameFieldBuilder().getBuilder(); } @@ -1720,7 +1732,7 @@ public com.google.protobuf.StringValueOrBuilder getFamilyNameOrBuilder() { * @return Whether the qualifier field is set. */ public boolean hasQualifier() { - return qualifierBuilder_ != null || qualifier_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1765,11 +1777,11 @@ public Builder setQualifier(com.google.protobuf.BytesValue value) { throw new NullPointerException(); } qualifier_ = value; - onChanged(); } else { qualifierBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1788,11 +1800,11 @@ public Builder setQualifier(com.google.protobuf.BytesValue value) { public Builder setQualifier(com.google.protobuf.BytesValue.Builder builderForValue) { if (qualifierBuilder_ == null) { qualifier_ = builderForValue.build(); - onChanged(); } else { qualifierBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1810,19 +1822,18 @@ public Builder setQualifier(com.google.protobuf.BytesValue.Builder builderForVal */ public Builder mergeQualifier(com.google.protobuf.BytesValue value) { if (qualifierBuilder_ == null) { - if (qualifier_ != null) { - qualifier_ = - com.google.protobuf.BytesValue.newBuilder(qualifier_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && qualifier_ != null + && qualifier_ != com.google.protobuf.BytesValue.getDefaultInstance()) { + getQualifierBuilder().mergeFrom(value); } else { qualifier_ = value; } - onChanged(); } else { qualifierBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1839,14 +1850,13 @@ public Builder mergeQualifier(com.google.protobuf.BytesValue value) { * .google.protobuf.BytesValue qualifier = 3; */ public Builder clearQualifier() { - if (qualifierBuilder_ == null) { - qualifier_ = null; - onChanged(); - } else { - qualifier_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + qualifier_ = null; + if (qualifierBuilder_ != null) { + qualifierBuilder_.dispose(); qualifierBuilder_ = null; } - + onChanged(); return this; } /** @@ -1863,7 +1873,7 @@ public Builder clearQualifier() { * .google.protobuf.BytesValue qualifier = 3; */ public com.google.protobuf.BytesValue.Builder getQualifierBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getQualifierFieldBuilder().getBuilder(); } @@ -1964,6 +1974,7 @@ public long getTimestampMicros() { public Builder setTimestampMicros(long value) { timestampMicros_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1986,7 +1997,7 @@ public Builder setTimestampMicros(long value) { * @return This builder for chaining. */ public Builder clearTimestampMicros() { - + bitField0_ = (bitField0_ & ~0x00000008); timestampMicros_ = 0L; onChanged(); return this; @@ -1996,9 +2007,9 @@ public Builder clearTimestampMicros() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLabelsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000010) != 0)) { labels_ = new com.google.protobuf.LazyStringArrayList(labels_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000010; } } /** @@ -2149,7 +2160,7 @@ public Builder addAllLabels(java.lang.Iterable values) { */ public Builder clearLabels() { labels_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -2218,8 +2229,8 @@ public Builder setValue(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - value_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2239,7 +2250,7 @@ public Builder setValue(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearValue() { - + bitField0_ = (bitField0_ & ~0x00000020); value_ = getDefaultInstance().getValue(); onChanged(); return this; @@ -2282,6 +2293,7 @@ public int getValueSize() { public Builder setValueSize(int value) { valueSize_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -2300,7 +2312,7 @@ public Builder setValueSize(int value) { * @return This builder for chaining. */ public Builder clearValueSize() { - + bitField0_ = (bitField0_ & ~0x00000040); valueSize_ = 0; onChanged(); return this; @@ -2353,6 +2365,7 @@ public boolean getResetRow() { * @return This builder for chaining. */ public Builder setResetRow(boolean value) { + rowStatusCase_ = 8; rowStatus_ = value; onChanged(); @@ -2426,6 +2439,7 @@ public boolean getCommitRow() { * @return This builder for chaining. */ public Builder setCommitRow(boolean value) { + rowStatusCase_ = 9; rowStatus_ = value; onChanged(); @@ -2517,6 +2531,8 @@ public com.google.bigtable.v2.ReadRowsResponse.CellChunk getDefaultInstanceForTy } public static final int CHUNKS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List chunks_; /** * @@ -2586,7 +2602,7 @@ public com.google.bigtable.v2.ReadRowsResponse.CellChunkOrBuilder getChunksOrBui } public static final int LAST_SCANNED_ROW_KEY_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString lastScannedRowKey_; + private com.google.protobuf.ByteString lastScannedRowKey_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -2702,7 +2718,9 @@ public com.google.bigtable.v2.RequestStats getRequestStats() { */ @java.lang.Override public com.google.bigtable.v2.RequestStatsOrBuilder getRequestStatsOrBuilder() { - return getRequestStats(); + return requestStats_ == null + ? com.google.bigtable.v2.RequestStats.getDefaultInstance() + : requestStats_; } private byte memoizedIsInitialized = -1; @@ -2926,6 +2944,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (chunksBuilder_ == null) { chunks_ = java.util.Collections.emptyList(); } else { @@ -2934,11 +2953,9 @@ public Builder clear() { } bitField0_ = (bitField0_ & ~0x00000001); lastScannedRowKey_ = com.google.protobuf.ByteString.EMPTY; - - if (requestStatsBuilder_ == null) { - requestStats_ = null; - } else { - requestStats_ = null; + requestStats_ = null; + if (requestStatsBuilder_ != null) { + requestStatsBuilder_.dispose(); requestStatsBuilder_ = null; } return this; @@ -2968,7 +2985,15 @@ public com.google.bigtable.v2.ReadRowsResponse build() { public com.google.bigtable.v2.ReadRowsResponse buildPartial() { com.google.bigtable.v2.ReadRowsResponse result = new com.google.bigtable.v2.ReadRowsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.bigtable.v2.ReadRowsResponse result) { if (chunksBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { chunks_ = java.util.Collections.unmodifiableList(chunks_); @@ -2978,14 +3003,17 @@ public com.google.bigtable.v2.ReadRowsResponse buildPartial() { } else { result.chunks_ = chunksBuilder_.build(); } - result.lastScannedRowKey_ = lastScannedRowKey_; - if (requestStatsBuilder_ == null) { - result.requestStats_ = requestStats_; - } else { - result.requestStats_ = requestStatsBuilder_.build(); + } + + private void buildPartial0(com.google.bigtable.v2.ReadRowsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.lastScannedRowKey_ = lastScannedRowKey_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.requestStats_ = + requestStatsBuilder_ == null ? requestStats_ : requestStatsBuilder_.build(); } - onBuilt(); - return result; } @java.lang.Override @@ -3109,13 +3137,13 @@ public Builder mergeFrom( case 18: { lastScannedRowKey_ = input.readBytes(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getRequestStatsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -3535,8 +3563,8 @@ public Builder setLastScannedRowKey(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - lastScannedRowKey_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -3558,7 +3586,7 @@ public Builder setLastScannedRowKey(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearLastScannedRowKey() { - + bitField0_ = (bitField0_ & ~0x00000002); lastScannedRowKey_ = getDefaultInstance().getLastScannedRowKey(); onChanged(); return this; @@ -3598,7 +3626,7 @@ public Builder clearLastScannedRowKey() { * @return Whether the requestStats field is set. */ public boolean hasRequestStats() { - return requestStatsBuilder_ != null || requestStats_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -3667,11 +3695,11 @@ public Builder setRequestStats(com.google.bigtable.v2.RequestStats value) { throw new NullPointerException(); } requestStats_ = value; - onChanged(); } else { requestStatsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -3702,11 +3730,11 @@ public Builder setRequestStats(com.google.bigtable.v2.RequestStats value) { public Builder setRequestStats(com.google.bigtable.v2.RequestStats.Builder builderForValue) { if (requestStatsBuilder_ == null) { requestStats_ = builderForValue.build(); - onChanged(); } else { requestStatsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -3736,19 +3764,18 @@ public Builder setRequestStats(com.google.bigtable.v2.RequestStats.Builder build */ public Builder mergeRequestStats(com.google.bigtable.v2.RequestStats value) { if (requestStatsBuilder_ == null) { - if (requestStats_ != null) { - requestStats_ = - com.google.bigtable.v2.RequestStats.newBuilder(requestStats_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && requestStats_ != null + && requestStats_ != com.google.bigtable.v2.RequestStats.getDefaultInstance()) { + getRequestStatsBuilder().mergeFrom(value); } else { requestStats_ = value; } - onChanged(); } else { requestStatsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -3777,14 +3804,13 @@ public Builder mergeRequestStats(com.google.bigtable.v2.RequestStats value) { * .google.bigtable.v2.RequestStats request_stats = 3; */ public Builder clearRequestStats() { - if (requestStatsBuilder_ == null) { - requestStats_ = null; - onChanged(); - } else { - requestStats_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + requestStats_ = null; + if (requestStatsBuilder_ != null) { + requestStatsBuilder_.dispose(); requestStatsBuilder_ = null; } - + onChanged(); return this; } /** @@ -3813,7 +3839,7 @@ public Builder clearRequestStats() { * .google.bigtable.v2.RequestStats request_stats = 3; */ public com.google.bigtable.v2.RequestStats.Builder getRequestStatsBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getRequestStatsFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RequestLatencyStats.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RequestLatencyStats.java index b8f0d518de..0edcfb6f10 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RequestLatencyStats.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RequestLatencyStats.java @@ -154,7 +154,9 @@ public com.google.protobuf.Duration getFrontendServerLatency() { */ @java.lang.Override public com.google.protobuf.DurationOrBuilder getFrontendServerLatencyOrBuilder() { - return getFrontendServerLatency(); + return frontendServerLatency_ == null + ? com.google.protobuf.Duration.getDefaultInstance() + : frontendServerLatency_; } private byte memoizedIsInitialized = -1; @@ -362,10 +364,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (frontendServerLatencyBuilder_ == null) { - frontendServerLatency_ = null; - } else { - frontendServerLatency_ = null; + bitField0_ = 0; + frontendServerLatency_ = null; + if (frontendServerLatencyBuilder_ != null) { + frontendServerLatencyBuilder_.dispose(); frontendServerLatencyBuilder_ = null; } return this; @@ -395,15 +397,23 @@ public com.google.bigtable.v2.RequestLatencyStats build() { public com.google.bigtable.v2.RequestLatencyStats buildPartial() { com.google.bigtable.v2.RequestLatencyStats result = new com.google.bigtable.v2.RequestLatencyStats(this); - if (frontendServerLatencyBuilder_ == null) { - result.frontendServerLatency_ = frontendServerLatency_; - } else { - result.frontendServerLatency_ = frontendServerLatencyBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.RequestLatencyStats result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.frontendServerLatency_ = + frontendServerLatencyBuilder_ == null + ? frontendServerLatency_ + : frontendServerLatencyBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -482,7 +492,7 @@ public Builder mergeFrom( { input.readMessage( getFrontendServerLatencyFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -502,6 +512,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.Duration frontendServerLatency_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, @@ -534,7 +546,7 @@ public Builder mergeFrom( * @return Whether the frontendServerLatency field is set. */ public boolean hasFrontendServerLatency() { - return frontendServerLatencyBuilder_ != null || frontendServerLatency_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -599,11 +611,11 @@ public Builder setFrontendServerLatency(com.google.protobuf.Duration value) { throw new NullPointerException(); } frontendServerLatency_ = value; - onChanged(); } else { frontendServerLatencyBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -632,11 +644,11 @@ public Builder setFrontendServerLatency(com.google.protobuf.Duration value) { public Builder setFrontendServerLatency(com.google.protobuf.Duration.Builder builderForValue) { if (frontendServerLatencyBuilder_ == null) { frontendServerLatency_ = builderForValue.build(); - onChanged(); } else { frontendServerLatencyBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -664,19 +676,18 @@ public Builder setFrontendServerLatency(com.google.protobuf.Duration.Builder bui */ public Builder mergeFrontendServerLatency(com.google.protobuf.Duration value) { if (frontendServerLatencyBuilder_ == null) { - if (frontendServerLatency_ != null) { - frontendServerLatency_ = - com.google.protobuf.Duration.newBuilder(frontendServerLatency_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && frontendServerLatency_ != null + && frontendServerLatency_ != com.google.protobuf.Duration.getDefaultInstance()) { + getFrontendServerLatencyBuilder().mergeFrom(value); } else { frontendServerLatency_ = value; } - onChanged(); } else { frontendServerLatencyBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -703,14 +714,13 @@ public Builder mergeFrontendServerLatency(com.google.protobuf.Duration value) { * .google.protobuf.Duration frontend_server_latency = 1; */ public Builder clearFrontendServerLatency() { - if (frontendServerLatencyBuilder_ == null) { - frontendServerLatency_ = null; - onChanged(); - } else { - frontendServerLatency_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + frontendServerLatency_ = null; + if (frontendServerLatencyBuilder_ != null) { + frontendServerLatencyBuilder_.dispose(); frontendServerLatencyBuilder_ = null; } - + onChanged(); return this; } /** @@ -737,7 +747,7 @@ public Builder clearFrontendServerLatency() { * .google.protobuf.Duration frontend_server_latency = 1; */ public com.google.protobuf.Duration.Builder getFrontendServerLatencyBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getFrontendServerLatencyFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RequestStats.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RequestStats.java index 9f648b3022..d92dc26501 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RequestStats.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RequestStats.java @@ -379,6 +379,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (fullReadStatsViewBuilder_ != null) { fullReadStatsViewBuilder_.clear(); } @@ -410,18 +411,26 @@ public com.google.bigtable.v2.RequestStats build() { @java.lang.Override public com.google.bigtable.v2.RequestStats buildPartial() { com.google.bigtable.v2.RequestStats result = new com.google.bigtable.v2.RequestStats(this); - if (statsViewCase_ == 1) { - if (fullReadStatsViewBuilder_ == null) { - result.statsView_ = statsView_; - } else { - result.statsView_ = fullReadStatsViewBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - result.statsViewCase_ = statsViewCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.RequestStats result) { + int from_bitField0_ = bitField0_; + } + + private void buildPartialOneofs(com.google.bigtable.v2.RequestStats result) { + result.statsViewCase_ = statsViewCase_; + result.statsView_ = this.statsView_; + if (statsViewCase_ == 1 && fullReadStatsViewBuilder_ != null) { + result.statsView_ = fullReadStatsViewBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -542,6 +551,8 @@ public Builder clearStatsView() { return this; } + private int bitField0_; + private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.FullReadStatsView, com.google.bigtable.v2.FullReadStatsView.Builder, @@ -757,7 +768,6 @@ public com.google.bigtable.v2.FullReadStatsViewOrBuilder getFullReadStatsViewOrB } statsViewCase_ = 1; onChanged(); - ; return fullReadStatsViewBuilder_; } diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ResponseParams.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ResponseParams.java index 6c0fc5c63f..205f65dcc7 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ResponseParams.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ResponseParams.java @@ -73,7 +73,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int ZONE_ID_FIELD_NUMBER = 1; - private volatile java.lang.Object zoneId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object zoneId_ = ""; /** * * @@ -137,7 +139,9 @@ public com.google.protobuf.ByteString getZoneIdBytes() { } public static final int CLUSTER_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object clusterId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object clusterId_ = ""; /** * * @@ -420,10 +424,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; zoneId_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); clusterId_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -451,19 +454,25 @@ public com.google.bigtable.v2.ResponseParams build() { public com.google.bigtable.v2.ResponseParams buildPartial() { com.google.bigtable.v2.ResponseParams result = new com.google.bigtable.v2.ResponseParams(this); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartial0(com.google.bigtable.v2.ResponseParams result) { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + result.zoneId_ = zoneId_; to_bitField0_ |= 0x00000001; } - result.zoneId_ = zoneId_; if (((from_bitField0_ & 0x00000002) != 0)) { + result.clusterId_ = clusterId_; to_bitField0_ |= 0x00000002; } - result.clusterId_ = clusterId_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; + result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -512,13 +521,13 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.bigtable.v2.ResponseParams other) { if (other == com.google.bigtable.v2.ResponseParams.getDefaultInstance()) return this; if (other.hasZoneId()) { - bitField0_ |= 0x00000001; zoneId_ = other.zoneId_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasClusterId()) { - bitField0_ |= 0x00000002; clusterId_ = other.clusterId_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -653,8 +662,8 @@ public Builder setZoneId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; zoneId_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -670,8 +679,8 @@ public Builder setZoneId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearZoneId() { - bitField0_ = (bitField0_ & ~0x00000001); zoneId_ = getDefaultInstance().getZoneId(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -692,8 +701,8 @@ public Builder setZoneIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - bitField0_ |= 0x00000001; zoneId_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -777,8 +786,8 @@ public Builder setClusterId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000002; clusterId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -795,8 +804,8 @@ public Builder setClusterId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearClusterId() { - bitField0_ = (bitField0_ & ~0x00000002); clusterId_ = getDefaultInstance().getClusterId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -818,8 +827,8 @@ public Builder setClusterIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - bitField0_ |= 0x00000002; clusterId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java index 8fe37c4d46..bdd65b4557 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java @@ -68,7 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int KEY_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString key_; + private com.google.protobuf.ByteString key_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -88,6 +88,8 @@ public com.google.protobuf.ByteString getKey() { } public static final int FAMILIES_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List families_; /** * @@ -366,15 +368,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; key_ = com.google.protobuf.ByteString.EMPTY; - if (familiesBuilder_ == null) { families_ = java.util.Collections.emptyList(); } else { families_ = null; familiesBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -400,19 +402,31 @@ public com.google.bigtable.v2.Row build() { @java.lang.Override public com.google.bigtable.v2.Row buildPartial() { com.google.bigtable.v2.Row result = new com.google.bigtable.v2.Row(this); - int from_bitField0_ = bitField0_; - result.key_ = key_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.bigtable.v2.Row result) { if (familiesBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { families_ = java.util.Collections.unmodifiableList(families_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.families_ = families_; } else { result.families_ = familiesBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.Row result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.key_ = key_; + } } @java.lang.Override @@ -467,7 +481,7 @@ public Builder mergeFrom(com.google.bigtable.v2.Row other) { if (!other.families_.isEmpty()) { if (families_.isEmpty()) { families_ = other.families_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureFamiliesIsMutable(); families_.addAll(other.families_); @@ -480,7 +494,7 @@ public Builder mergeFrom(com.google.bigtable.v2.Row other) { familiesBuilder_.dispose(); familiesBuilder_ = null; families_ = other.families_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); familiesBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getFamiliesFieldBuilder() @@ -519,7 +533,7 @@ public Builder mergeFrom( case 10: { key_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -589,8 +603,8 @@ public Builder setKey(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - key_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -608,7 +622,7 @@ public Builder setKey(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearKey() { - + bitField0_ = (bitField0_ & ~0x00000001); key_ = getDefaultInstance().getKey(); onChanged(); return this; @@ -618,9 +632,9 @@ public Builder clearKey() { java.util.Collections.emptyList(); private void ensureFamiliesIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { families_ = new java.util.ArrayList(families_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -844,7 +858,7 @@ public Builder addAllFamilies( public Builder clearFamilies() { if (familiesBuilder_ == null) { families_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { familiesBuilder_.clear(); @@ -972,7 +986,7 @@ public java.util.List getFamiliesBuilderL com.google.bigtable.v2.Family, com.google.bigtable.v2.Family.Builder, com.google.bigtable.v2.FamilyOrBuilder>( - families_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + families_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); families_ = null; } return familiesBuilder_; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java index 89d7c853b7..7087d4786e 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java @@ -206,6 +206,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int FILTERS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List filters_; /** * @@ -484,6 +486,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (filtersBuilder_ == null) { filters_ = java.util.Collections.emptyList(); } else { @@ -518,7 +521,15 @@ public com.google.bigtable.v2.RowFilter.Chain build() { public com.google.bigtable.v2.RowFilter.Chain buildPartial() { com.google.bigtable.v2.RowFilter.Chain result = new com.google.bigtable.v2.RowFilter.Chain(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.bigtable.v2.RowFilter.Chain result) { if (filtersBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { filters_ = java.util.Collections.unmodifiableList(filters_); @@ -528,8 +539,10 @@ public com.google.bigtable.v2.RowFilter.Chain buildPartial() { } else { result.filters_ = filtersBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.RowFilter.Chain result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -1329,6 +1342,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int FILTERS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List filters_; /** * @@ -1709,6 +1724,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (filtersBuilder_ == null) { filters_ = java.util.Collections.emptyList(); } else { @@ -1743,7 +1759,15 @@ public com.google.bigtable.v2.RowFilter.Interleave build() { public com.google.bigtable.v2.RowFilter.Interleave buildPartial() { com.google.bigtable.v2.RowFilter.Interleave result = new com.google.bigtable.v2.RowFilter.Interleave(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.bigtable.v2.RowFilter.Interleave result) { if (filtersBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { filters_ = java.util.Collections.unmodifiableList(filters_); @@ -1753,8 +1777,10 @@ public com.google.bigtable.v2.RowFilter.Interleave buildPartial() { } else { result.filters_ = filtersBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.RowFilter.Interleave result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -2919,7 +2945,9 @@ public com.google.bigtable.v2.RowFilter getPredicateFilter() { */ @java.lang.Override public com.google.bigtable.v2.RowFilterOrBuilder getPredicateFilterOrBuilder() { - return getPredicateFilter(); + return predicateFilter_ == null + ? com.google.bigtable.v2.RowFilter.getDefaultInstance() + : predicateFilter_; } public static final int TRUE_FILTER_FIELD_NUMBER = 2; @@ -2970,7 +2998,9 @@ public com.google.bigtable.v2.RowFilter getTrueFilter() { */ @java.lang.Override public com.google.bigtable.v2.RowFilterOrBuilder getTrueFilterOrBuilder() { - return getTrueFilter(); + return trueFilter_ == null + ? com.google.bigtable.v2.RowFilter.getDefaultInstance() + : trueFilter_; } public static final int FALSE_FILTER_FIELD_NUMBER = 3; @@ -3024,7 +3054,9 @@ public com.google.bigtable.v2.RowFilter getFalseFilter() { */ @java.lang.Override public com.google.bigtable.v2.RowFilterOrBuilder getFalseFilterOrBuilder() { - return getFalseFilter(); + return falseFilter_ == null + ? com.google.bigtable.v2.RowFilter.getDefaultInstance() + : falseFilter_; } private byte memoizedIsInitialized = -1; @@ -3264,22 +3296,20 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (predicateFilterBuilder_ == null) { - predicateFilter_ = null; - } else { - predicateFilter_ = null; + bitField0_ = 0; + predicateFilter_ = null; + if (predicateFilterBuilder_ != null) { + predicateFilterBuilder_.dispose(); predicateFilterBuilder_ = null; } - if (trueFilterBuilder_ == null) { - trueFilter_ = null; - } else { - trueFilter_ = null; + trueFilter_ = null; + if (trueFilterBuilder_ != null) { + trueFilterBuilder_.dispose(); trueFilterBuilder_ = null; } - if (falseFilterBuilder_ == null) { - falseFilter_ = null; - } else { - falseFilter_ = null; + falseFilter_ = null; + if (falseFilterBuilder_ != null) { + falseFilterBuilder_.dispose(); falseFilterBuilder_ = null; } return this; @@ -3309,25 +3339,29 @@ public com.google.bigtable.v2.RowFilter.Condition build() { public com.google.bigtable.v2.RowFilter.Condition buildPartial() { com.google.bigtable.v2.RowFilter.Condition result = new com.google.bigtable.v2.RowFilter.Condition(this); - if (predicateFilterBuilder_ == null) { - result.predicateFilter_ = predicateFilter_; - } else { - result.predicateFilter_ = predicateFilterBuilder_.build(); - } - if (trueFilterBuilder_ == null) { - result.trueFilter_ = trueFilter_; - } else { - result.trueFilter_ = trueFilterBuilder_.build(); - } - if (falseFilterBuilder_ == null) { - result.falseFilter_ = falseFilter_; - } else { - result.falseFilter_ = falseFilterBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.RowFilter.Condition result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.predicateFilter_ = + predicateFilterBuilder_ == null ? predicateFilter_ : predicateFilterBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.trueFilter_ = + trueFilterBuilder_ == null ? trueFilter_ : trueFilterBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.falseFilter_ = + falseFilterBuilder_ == null ? falseFilter_ : falseFilterBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -3414,19 +3448,19 @@ public Builder mergeFrom( { input.readMessage( getPredicateFilterFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getTrueFilterFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage(getFalseFilterFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -3446,6 +3480,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.bigtable.v2.RowFilter predicateFilter_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.RowFilter, @@ -3465,7 +3501,7 @@ public Builder mergeFrom( * @return Whether the predicateFilter field is set. */ public boolean hasPredicateFilter() { - return predicateFilterBuilder_ != null || predicateFilter_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -3504,11 +3540,11 @@ public Builder setPredicateFilter(com.google.bigtable.v2.RowFilter value) { throw new NullPointerException(); } predicateFilter_ = value; - onChanged(); } else { predicateFilterBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -3524,11 +3560,11 @@ public Builder setPredicateFilter(com.google.bigtable.v2.RowFilter value) { public Builder setPredicateFilter(com.google.bigtable.v2.RowFilter.Builder builderForValue) { if (predicateFilterBuilder_ == null) { predicateFilter_ = builderForValue.build(); - onChanged(); } else { predicateFilterBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -3543,19 +3579,18 @@ public Builder setPredicateFilter(com.google.bigtable.v2.RowFilter.Builder build */ public Builder mergePredicateFilter(com.google.bigtable.v2.RowFilter value) { if (predicateFilterBuilder_ == null) { - if (predicateFilter_ != null) { - predicateFilter_ = - com.google.bigtable.v2.RowFilter.newBuilder(predicateFilter_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && predicateFilter_ != null + && predicateFilter_ != com.google.bigtable.v2.RowFilter.getDefaultInstance()) { + getPredicateFilterBuilder().mergeFrom(value); } else { predicateFilter_ = value; } - onChanged(); } else { predicateFilterBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -3569,14 +3604,13 @@ public Builder mergePredicateFilter(com.google.bigtable.v2.RowFilter value) { * .google.bigtable.v2.RowFilter predicate_filter = 1; */ public Builder clearPredicateFilter() { - if (predicateFilterBuilder_ == null) { - predicateFilter_ = null; - onChanged(); - } else { - predicateFilter_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + predicateFilter_ = null; + if (predicateFilterBuilder_ != null) { + predicateFilterBuilder_.dispose(); predicateFilterBuilder_ = null; } - + onChanged(); return this; } /** @@ -3590,7 +3624,7 @@ public Builder clearPredicateFilter() { * .google.bigtable.v2.RowFilter predicate_filter = 1; */ public com.google.bigtable.v2.RowFilter.Builder getPredicateFilterBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getPredicateFilterFieldBuilder().getBuilder(); } @@ -3659,7 +3693,7 @@ public com.google.bigtable.v2.RowFilterOrBuilder getPredicateFilterOrBuilder() { * @return Whether the trueFilter field is set. */ public boolean hasTrueFilter() { - return trueFilterBuilder_ != null || trueFilter_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -3698,11 +3732,11 @@ public Builder setTrueFilter(com.google.bigtable.v2.RowFilter value) { throw new NullPointerException(); } trueFilter_ = value; - onChanged(); } else { trueFilterBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -3718,11 +3752,11 @@ public Builder setTrueFilter(com.google.bigtable.v2.RowFilter value) { public Builder setTrueFilter(com.google.bigtable.v2.RowFilter.Builder builderForValue) { if (trueFilterBuilder_ == null) { trueFilter_ = builderForValue.build(); - onChanged(); } else { trueFilterBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -3737,19 +3771,18 @@ public Builder setTrueFilter(com.google.bigtable.v2.RowFilter.Builder builderFor */ public Builder mergeTrueFilter(com.google.bigtable.v2.RowFilter value) { if (trueFilterBuilder_ == null) { - if (trueFilter_ != null) { - trueFilter_ = - com.google.bigtable.v2.RowFilter.newBuilder(trueFilter_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && trueFilter_ != null + && trueFilter_ != com.google.bigtable.v2.RowFilter.getDefaultInstance()) { + getTrueFilterBuilder().mergeFrom(value); } else { trueFilter_ = value; } - onChanged(); } else { trueFilterBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -3763,14 +3796,13 @@ public Builder mergeTrueFilter(com.google.bigtable.v2.RowFilter value) { * .google.bigtable.v2.RowFilter true_filter = 2; */ public Builder clearTrueFilter() { - if (trueFilterBuilder_ == null) { - trueFilter_ = null; - onChanged(); - } else { - trueFilter_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + trueFilter_ = null; + if (trueFilterBuilder_ != null) { + trueFilterBuilder_.dispose(); trueFilterBuilder_ = null; } - + onChanged(); return this; } /** @@ -3784,7 +3816,7 @@ public Builder clearTrueFilter() { * .google.bigtable.v2.RowFilter true_filter = 2; */ public com.google.bigtable.v2.RowFilter.Builder getTrueFilterBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getTrueFilterFieldBuilder().getBuilder(); } @@ -3854,7 +3886,7 @@ public com.google.bigtable.v2.RowFilterOrBuilder getTrueFilterOrBuilder() { * @return Whether the falseFilter field is set. */ public boolean hasFalseFilter() { - return falseFilterBuilder_ != null || falseFilter_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -3895,11 +3927,11 @@ public Builder setFalseFilter(com.google.bigtable.v2.RowFilter value) { throw new NullPointerException(); } falseFilter_ = value; - onChanged(); } else { falseFilterBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -3916,11 +3948,11 @@ public Builder setFalseFilter(com.google.bigtable.v2.RowFilter value) { public Builder setFalseFilter(com.google.bigtable.v2.RowFilter.Builder builderForValue) { if (falseFilterBuilder_ == null) { falseFilter_ = builderForValue.build(); - onChanged(); } else { falseFilterBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -3936,19 +3968,18 @@ public Builder setFalseFilter(com.google.bigtable.v2.RowFilter.Builder builderFo */ public Builder mergeFalseFilter(com.google.bigtable.v2.RowFilter value) { if (falseFilterBuilder_ == null) { - if (falseFilter_ != null) { - falseFilter_ = - com.google.bigtable.v2.RowFilter.newBuilder(falseFilter_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && falseFilter_ != null + && falseFilter_ != com.google.bigtable.v2.RowFilter.getDefaultInstance()) { + getFalseFilterBuilder().mergeFrom(value); } else { falseFilter_ = value; } - onChanged(); } else { falseFilterBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -3963,14 +3994,13 @@ public Builder mergeFalseFilter(com.google.bigtable.v2.RowFilter value) { * .google.bigtable.v2.RowFilter false_filter = 3; */ public Builder clearFalseFilter() { - if (falseFilterBuilder_ == null) { - falseFilter_ = null; - onChanged(); - } else { - falseFilter_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + falseFilter_ = null; + if (falseFilterBuilder_ != null) { + falseFilterBuilder_.dispose(); falseFilterBuilder_ = null; } - + onChanged(); return this; } /** @@ -3985,7 +4015,7 @@ public Builder clearFalseFilter() { * .google.bigtable.v2.RowFilter false_filter = 3; */ public com.google.bigtable.v2.RowFilter.Builder getFalseFilterBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getFalseFilterFieldBuilder().getBuilder(); } @@ -5752,6 +5782,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (chainBuilder_ != null) { chainBuilder_.clear(); } @@ -5798,90 +5829,39 @@ public com.google.bigtable.v2.RowFilter build() { @java.lang.Override public com.google.bigtable.v2.RowFilter buildPartial() { com.google.bigtable.v2.RowFilter result = new com.google.bigtable.v2.RowFilter(this); - if (filterCase_ == 1) { - if (chainBuilder_ == null) { - result.filter_ = filter_; - } else { - result.filter_ = chainBuilder_.build(); - } - } - if (filterCase_ == 2) { - if (interleaveBuilder_ == null) { - result.filter_ = filter_; - } else { - result.filter_ = interleaveBuilder_.build(); - } - } - if (filterCase_ == 3) { - if (conditionBuilder_ == null) { - result.filter_ = filter_; - } else { - result.filter_ = conditionBuilder_.build(); - } - } - if (filterCase_ == 16) { - result.filter_ = filter_; - } - if (filterCase_ == 17) { - result.filter_ = filter_; + if (bitField0_ != 0) { + buildPartial0(result); } - if (filterCase_ == 18) { - result.filter_ = filter_; - } - if (filterCase_ == 4) { - result.filter_ = filter_; - } - if (filterCase_ == 14) { - result.filter_ = filter_; - } - if (filterCase_ == 5) { - result.filter_ = filter_; - } - if (filterCase_ == 6) { - result.filter_ = filter_; - } - if (filterCase_ == 7) { - if (columnRangeFilterBuilder_ == null) { - result.filter_ = filter_; - } else { - result.filter_ = columnRangeFilterBuilder_.build(); - } - } - if (filterCase_ == 8) { - if (timestampRangeFilterBuilder_ == null) { - result.filter_ = filter_; - } else { - result.filter_ = timestampRangeFilterBuilder_.build(); - } - } - if (filterCase_ == 9) { - result.filter_ = filter_; - } - if (filterCase_ == 15) { - if (valueRangeFilterBuilder_ == null) { - result.filter_ = filter_; - } else { - result.filter_ = valueRangeFilterBuilder_.build(); - } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartial0(com.google.bigtable.v2.RowFilter result) { + int from_bitField0_ = bitField0_; + } + + private void buildPartialOneofs(com.google.bigtable.v2.RowFilter result) { + result.filterCase_ = filterCase_; + result.filter_ = this.filter_; + if (filterCase_ == 1 && chainBuilder_ != null) { + result.filter_ = chainBuilder_.build(); } - if (filterCase_ == 10) { - result.filter_ = filter_; + if (filterCase_ == 2 && interleaveBuilder_ != null) { + result.filter_ = interleaveBuilder_.build(); } - if (filterCase_ == 11) { - result.filter_ = filter_; + if (filterCase_ == 3 && conditionBuilder_ != null) { + result.filter_ = conditionBuilder_.build(); } - if (filterCase_ == 12) { - result.filter_ = filter_; + if (filterCase_ == 7 && columnRangeFilterBuilder_ != null) { + result.filter_ = columnRangeFilterBuilder_.build(); } - if (filterCase_ == 13) { - result.filter_ = filter_; + if (filterCase_ == 8 && timestampRangeFilterBuilder_ != null) { + result.filter_ = timestampRangeFilterBuilder_.build(); } - if (filterCase_ == 19) { - result.filter_ = filter_; + if (filterCase_ == 15 && valueRangeFilterBuilder_ != null) { + result.filter_ = valueRangeFilterBuilder_.build(); } - result.filterCase_ = filterCase_; - onBuilt(); - return result; } @java.lang.Override @@ -6210,6 +6190,8 @@ public Builder clearFilter() { return this; } + private int bitField0_; + private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.RowFilter.Chain, com.google.bigtable.v2.RowFilter.Chain.Builder, @@ -6424,7 +6406,6 @@ public com.google.bigtable.v2.RowFilter.ChainOrBuilder getChainOrBuilder() { } filterCase_ = 1; onChanged(); - ; return chainBuilder_; } @@ -6643,7 +6624,6 @@ public com.google.bigtable.v2.RowFilter.InterleaveOrBuilder getInterleaveOrBuild } filterCase_ = 2; onChanged(); - ; return interleaveBuilder_; } @@ -6862,7 +6842,6 @@ public com.google.bigtable.v2.RowFilter.ConditionOrBuilder getConditionOrBuilder } filterCase_ = 3; onChanged(); - ; return conditionBuilder_; } @@ -7069,6 +7048,7 @@ public boolean getSink() { * @return This builder for chaining. */ public Builder setSink(boolean value) { + filterCase_ = 16; filter_ = value; onChanged(); @@ -7194,6 +7174,7 @@ public boolean getPassAllFilter() { * @return This builder for chaining. */ public Builder setPassAllFilter(boolean value) { + filterCase_ = 17; filter_ = value; onChanged(); @@ -7267,6 +7248,7 @@ public boolean getBlockAllFilter() { * @return This builder for chaining. */ public Builder setBlockAllFilter(boolean value) { + filterCase_ = 18; filter_ = value; onChanged(); @@ -7436,6 +7418,7 @@ public double getRowSampleFilter() { * @return This builder for chaining. */ public Builder setRowSampleFilter(double value) { + filterCase_ = 14; filter_ = value; onChanged(); @@ -7922,7 +7905,6 @@ public com.google.bigtable.v2.ColumnRangeOrBuilder getColumnRangeFilterOrBuilder } filterCase_ = 7; onChanged(); - ; return columnRangeFilterBuilder_; } @@ -8130,7 +8112,6 @@ public com.google.bigtable.v2.TimestampRangeOrBuilder getTimestampRangeFilterOrB } filterCase_ = 8; onChanged(); - ; return timestampRangeFilterBuilder_; } @@ -8425,7 +8406,6 @@ public com.google.bigtable.v2.ValueRangeOrBuilder getValueRangeFilterOrBuilder() } filterCase_ = 15; onChanged(); - ; return valueRangeFilterBuilder_; } @@ -8479,6 +8459,7 @@ public int getCellsPerRowOffsetFilter() { * @return This builder for chaining. */ public Builder setCellsPerRowOffsetFilter(int value) { + filterCase_ = 10; filter_ = value; onChanged(); @@ -8556,6 +8537,7 @@ public int getCellsPerRowLimitFilter() { * @return This builder for chaining. */ public Builder setCellsPerRowLimitFilter(int value) { + filterCase_ = 11; filter_ = value; onChanged(); @@ -8642,6 +8624,7 @@ public int getCellsPerColumnLimitFilter() { * @return This builder for chaining. */ public Builder setCellsPerColumnLimitFilter(int value) { + filterCase_ = 12; filter_ = value; onChanged(); @@ -8716,6 +8699,7 @@ public boolean getStripValueTransformer() { * @return This builder for chaining. */ public Builder setStripValueTransformer(boolean value) { + filterCase_ = 13; filter_ = value; onChanged(); diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java index a9cdcc73c4..6a78dd4d7e 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java @@ -560,6 +560,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; startKeyCase_ = 0; startKey_ = null; endKeyCase_ = 0; @@ -590,24 +591,25 @@ public com.google.bigtable.v2.RowRange build() { @java.lang.Override public com.google.bigtable.v2.RowRange buildPartial() { com.google.bigtable.v2.RowRange result = new com.google.bigtable.v2.RowRange(this); - if (startKeyCase_ == 1) { - result.startKey_ = startKey_; - } - if (startKeyCase_ == 2) { - result.startKey_ = startKey_; - } - if (endKeyCase_ == 3) { - result.endKey_ = endKey_; - } - if (endKeyCase_ == 4) { - result.endKey_ = endKey_; + if (bitField0_ != 0) { + buildPartial0(result); } - result.startKeyCase_ = startKeyCase_; - result.endKeyCase_ = endKeyCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.RowRange result) { + int from_bitField0_ = bitField0_; + } + + private void buildPartialOneofs(com.google.bigtable.v2.RowRange result) { + result.startKeyCase_ = startKeyCase_; + result.startKey_ = this.startKey_; + result.endKeyCase_ = endKeyCase_; + result.endKey_ = this.endKey_; + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -780,6 +782,8 @@ public Builder clearEndKey() { return this; } + private int bitField0_; + /** * * diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java index 86d5b281a9..af316aefdb 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java @@ -67,6 +67,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ROW_KEYS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List rowKeys_; /** * @@ -114,6 +116,8 @@ public com.google.protobuf.ByteString getRowKeys(int index) { } public static final int ROW_RANGES_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List rowRanges_; /** * @@ -393,8 +397,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; rowKeys_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); if (rowRangesBuilder_ == null) { rowRanges_ = java.util.Collections.emptyList(); } else { @@ -427,7 +431,15 @@ public com.google.bigtable.v2.RowSet build() { @java.lang.Override public com.google.bigtable.v2.RowSet buildPartial() { com.google.bigtable.v2.RowSet result = new com.google.bigtable.v2.RowSet(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.bigtable.v2.RowSet result) { if (((bitField0_ & 0x00000001) != 0)) { rowKeys_ = java.util.Collections.unmodifiableList(rowKeys_); bitField0_ = (bitField0_ & ~0x00000001); @@ -442,8 +454,10 @@ public com.google.bigtable.v2.RowSet buildPartial() { } else { result.rowRanges_ = rowRangesBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.bigtable.v2.RowSet result) { + int from_bitField0_ = bitField0_; } @java.lang.Override diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java index 6bebd6765d..cd19316bdc 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int TABLE_NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object tableName_; + + @SuppressWarnings("serial") + private volatile java.lang.Object tableName_ = ""; /** * * @@ -126,7 +128,9 @@ public com.google.protobuf.ByteString getTableNameBytes() { } public static final int APP_PROFILE_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object appProfileId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object appProfileId_ = ""; /** * * @@ -382,10 +386,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; tableName_ = ""; - appProfileId_ = ""; - return this; } @@ -413,12 +416,23 @@ public com.google.bigtable.v2.SampleRowKeysRequest build() { public com.google.bigtable.v2.SampleRowKeysRequest buildPartial() { com.google.bigtable.v2.SampleRowKeysRequest result = new com.google.bigtable.v2.SampleRowKeysRequest(this); - result.tableName_ = tableName_; - result.appProfileId_ = appProfileId_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.SampleRowKeysRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.tableName_ = tableName_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.appProfileId_ = appProfileId_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -466,10 +480,12 @@ public Builder mergeFrom(com.google.bigtable.v2.SampleRowKeysRequest other) { if (other == com.google.bigtable.v2.SampleRowKeysRequest.getDefaultInstance()) return this; if (!other.getTableName().isEmpty()) { tableName_ = other.tableName_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getAppProfileId().isEmpty()) { appProfileId_ = other.appProfileId_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -501,13 +517,13 @@ public Builder mergeFrom( case 10: { tableName_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { appProfileId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -527,6 +543,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object tableName_ = ""; /** * @@ -600,8 +618,8 @@ public Builder setTableName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -621,8 +639,8 @@ public Builder setTableName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTableName() { - tableName_ = getDefaultInstance().getTableName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -647,8 +665,8 @@ public Builder setTableNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - tableName_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -717,8 +735,8 @@ public Builder setAppProfileId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -735,8 +753,8 @@ public Builder setAppProfileId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearAppProfileId() { - appProfileId_ = getDefaultInstance().getAppProfileId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -758,8 +776,8 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - appProfileId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java index 64730abc0c..15412bb47d 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java @@ -68,7 +68,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ROW_KEY_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString rowKey_; + private com.google.protobuf.ByteString rowKey_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -92,7 +92,7 @@ public com.google.protobuf.ByteString getRowKey() { } public static final int OFFSET_BYTES_FIELD_NUMBER = 2; - private long offsetBytes_; + private long offsetBytes_ = 0L; /** * * @@ -318,10 +318,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; rowKey_ = com.google.protobuf.ByteString.EMPTY; - offsetBytes_ = 0L; - return this; } @@ -349,12 +348,23 @@ public com.google.bigtable.v2.SampleRowKeysResponse build() { public com.google.bigtable.v2.SampleRowKeysResponse buildPartial() { com.google.bigtable.v2.SampleRowKeysResponse result = new com.google.bigtable.v2.SampleRowKeysResponse(this); - result.rowKey_ = rowKey_; - result.offsetBytes_ = offsetBytes_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.SampleRowKeysResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.rowKey_ = rowKey_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.offsetBytes_ = offsetBytes_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -435,13 +445,13 @@ public Builder mergeFrom( case 10: { rowKey_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { offsetBytes_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -461,6 +471,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.ByteString rowKey_ = com.google.protobuf.ByteString.EMPTY; /** * @@ -505,8 +517,8 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - rowKey_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -528,7 +540,7 @@ public Builder setRowKey(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearRowKey() { - + bitField0_ = (bitField0_ & ~0x00000001); rowKey_ = getDefaultInstance().getRowKey(); onChanged(); return this; @@ -571,6 +583,7 @@ public long getOffsetBytes() { public Builder setOffsetBytes(long value) { offsetBytes_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -589,7 +602,7 @@ public Builder setOffsetBytes(long value) { * @return This builder for chaining. */ public Builder clearOffsetBytes() { - + bitField0_ = (bitField0_ & ~0x00000002); offsetBytes_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java index b570b88de0..f972b189d7 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int START_TIMESTAMP_MICROS_FIELD_NUMBER = 1; - private long startTimestampMicros_; + private long startTimestampMicros_ = 0L; /** * * @@ -84,7 +84,7 @@ public long getStartTimestampMicros() { } public static final int END_TIMESTAMP_MICROS_FIELD_NUMBER = 2; - private long endTimestampMicros_; + private long endTimestampMicros_ = 0L; /** * * @@ -305,10 +305,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; startTimestampMicros_ = 0L; - endTimestampMicros_ = 0L; - return this; } @@ -336,12 +335,23 @@ public com.google.bigtable.v2.TimestampRange build() { public com.google.bigtable.v2.TimestampRange buildPartial() { com.google.bigtable.v2.TimestampRange result = new com.google.bigtable.v2.TimestampRange(this); - result.startTimestampMicros_ = startTimestampMicros_; - result.endTimestampMicros_ = endTimestampMicros_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.TimestampRange result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.startTimestampMicros_ = startTimestampMicros_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.endTimestampMicros_ = endTimestampMicros_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -422,13 +432,13 @@ public Builder mergeFrom( case 8: { startTimestampMicros_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 case 16: { endTimestampMicros_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -448,6 +458,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private long startTimestampMicros_; /** * @@ -479,6 +491,7 @@ public long getStartTimestampMicros() { public Builder setStartTimestampMicros(long value) { startTimestampMicros_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -494,7 +507,7 @@ public Builder setStartTimestampMicros(long value) { * @return This builder for chaining. */ public Builder clearStartTimestampMicros() { - + bitField0_ = (bitField0_ & ~0x00000001); startTimestampMicros_ = 0L; onChanged(); return this; @@ -531,6 +544,7 @@ public long getEndTimestampMicros() { public Builder setEndTimestampMicros(long value) { endTimestampMicros_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -546,7 +560,7 @@ public Builder setEndTimestampMicros(long value) { * @return This builder for chaining. */ public Builder clearEndTimestampMicros() { - + bitField0_ = (bitField0_ & ~0x00000002); endTimestampMicros_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java index b9ad1af05f..802f804933 100644 --- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java +++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java @@ -563,6 +563,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; startValueCase_ = 0; startValue_ = null; endValueCase_ = 0; @@ -593,24 +594,25 @@ public com.google.bigtable.v2.ValueRange build() { @java.lang.Override public com.google.bigtable.v2.ValueRange buildPartial() { com.google.bigtable.v2.ValueRange result = new com.google.bigtable.v2.ValueRange(this); - if (startValueCase_ == 1) { - result.startValue_ = startValue_; - } - if (startValueCase_ == 2) { - result.startValue_ = startValue_; - } - if (endValueCase_ == 3) { - result.endValue_ = endValue_; - } - if (endValueCase_ == 4) { - result.endValue_ = endValue_; + if (bitField0_ != 0) { + buildPartial0(result); } - result.startValueCase_ = startValueCase_; - result.endValueCase_ = endValueCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.bigtable.v2.ValueRange result) { + int from_bitField0_ = bitField0_; + } + + private void buildPartialOneofs(com.google.bigtable.v2.ValueRange result) { + result.startValueCase_ = startValueCase_; + result.startValue_ = this.startValue_; + result.endValueCase_ = endValueCase_; + result.endValue_ = this.endValue_; + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -783,6 +785,8 @@ public Builder clearEndValue() { return this; } + private int bitField0_; + /** * * diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 1ce9f75c12..f6605624b4 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigtable - 2.18.0 + 2.18.1 diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml index 34746b6234..1cf5c3015d 100644 --- a/samples/native-image-sample/pom.xml +++ b/samples/native-image-sample/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.3.0 + 26.4.0 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 960160cfd4..f68598d3e5 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 2.18.1 + 2.18.2 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 6d31e3d7c9..e6bee54ad7 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.3.0 + 26.4.0 pom import diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml index 216e35a13d..22c60c3e01 100644 --- a/test-proxy/pom.xml +++ b/test-proxy/pom.xml @@ -12,11 +12,11 @@ google-cloud-bigtable-parent com.google.cloud - 2.18.1 + 2.18.2 - 2.18.1 + 2.18.2 diff --git a/versions.txt b/versions.txt index 02bade10d5..f9f0881af6 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:2.18.1:2.18.1 -grpc-google-cloud-bigtable-admin-v2:2.18.1:2.18.1 -grpc-google-cloud-bigtable-v2:2.18.1:2.18.1 -proto-google-cloud-bigtable-admin-v2:2.18.1:2.18.1 -proto-google-cloud-bigtable-v2:2.18.1:2.18.1 -google-cloud-bigtable-emulator:0.155.1:0.155.1 -google-cloud-bigtable-emulator-core:2.18.1:2.18.1 +google-cloud-bigtable:2.18.2:2.18.2 +grpc-google-cloud-bigtable-admin-v2:2.18.2:2.18.2 +grpc-google-cloud-bigtable-v2:2.18.2:2.18.2 +proto-google-cloud-bigtable-admin-v2:2.18.2:2.18.2 +proto-google-cloud-bigtable-v2:2.18.2:2.18.2 +google-cloud-bigtable-emulator:0.155.2:0.155.2 +google-cloud-bigtable-emulator-core:2.18.2:2.18.2