Update v1beta3 branch with master's most recent changes #817

ajkannan · 2016-03-29T22:45:43Z

Most of the merge conflicts came out of API improvements we made in the v1beta2 code after writing the snippets in java-docs-samples.

I dealt with merge conflicts in the following files:

BaseEntity (added list helper method for latlngs + javadoc for set methods)
DatastoreImpl (nothing added except "spi" import change)
ListValue (now using addValueHelper like in master)
package-info (split snippets into two, consistent with master)
StructuredQuery (only javadoc changes at the top of the file)
pom.xml
BaseEntityTest (merged in list changes from master + added a list of latlng values)
DatastoreExceptionTest (kept the error code at 14, instead of 503 as used in Apiary)
DatastoreTest (to use the same query pagination cursors as in master)
SerializationTest (to use new BaseSerializationTest)
DatastoreRpc (remove exception throwing, remove extraneous com.google.datastore.v1beta3.)
DefaultDatastoreRpc.java (same as DatastoreRpc)

Creates DnsService interface and DnsOptions

…tion to TableDefinition

Remove TableInfo hierarchy, add TableType hierarchy

- Dataset extends DatasetInfo - Table extends TableInfo - Job extends JobInfo - Update READMEs and snippets - Update BigQueryExample - Update and add more tests

thrown when parent objects do not exist. Changed contracts of applyChangeRequest and getChangeRequest methods. Adjusted tests.

Added Dns methods, Zone and ZoneTest. Fixes googleapis#596.

- Make Builder public - Make Dataset.builder package scope - Add toAndFromPb test - Remove static get methods

Closes googleapis#594.

…r methods from Resource Manager's Project

- Remove static builder methods - Add builder methods params to builder constructors - Better javadoc for builder classes

Make bigquery functional classes extend info classes

Completes DnsRpc interface by adding methods and doc. Implements DefaultDnsRpc.

Also makes id a read-only string instead of BigInteger. Includes rewriting testsfor Zone.

Fix the 'Definition of groupId is redundant' mvn warning

Make Table methods public

update pom.xml to include DNS in javadoc groups

Add package info for dns.testing

Add comment about releasing new modules

googlebot · 2016-03-29T22:45:49Z

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

coveralls · 2016-03-29T22:51:55Z

Coverage increased (+3.3%) to 85.76% when pulling 2b52294 on ajkannan:bring-v1beta3-up-to-speed into 47aae51 on GoogleCloudPlatform:update-datastore.

aozarov · 2016-03-30T00:15:19Z

Looks good. Feel free to merge.

…onfig to v1.5.0 (#817) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.4.0` -> `1.5.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.0/compatibility-slim/1.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.5.0/confidence-slim/1.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-datacatalog).

🤖 I have created a release *beep* *boop* --- ## [2.3.0](googleapis/java-trace@v2.2.0...v2.3.0) (2022-07-01) ### Features * Enable REST transport for most of Java and Go clients ([googleapis#812](googleapis/java-trace#812)) ([60faebf](googleapis/java-trace@60faebf)) ### Documentation * **sample:** clean up README for native image sample ([googleapis#808](googleapis/java-trace#808)) ([dd977db](googleapis/java-trace@dd977db)) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.13.0 ([googleapis#811](googleapis/java-trace#811)) ([3cd4d69](googleapis/java-trace@3cd4d69)) * update dependency org.graalvm.buildtools:junit-platform-native to v0.9.12 ([googleapis#809](googleapis/java-trace#809)) ([5adc489](googleapis/java-trace@5adc489)) * update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.12 ([googleapis#810](googleapis/java-trace#810)) ([660e2fa](googleapis/java-trace@660e2fa)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

…817) * chore(deps): update dependency com.google.cloud:libraries-bom to v26 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

🤖 I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

…1.0 (#817) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/googleapis/java-cloud-bom)) | `26.0.0` -> `26.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.0/compatibility-slim/26.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.0/confidence-slim/26.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-secretmanager).

🤖 I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

- [ ] Regenerate this pull request now. PiperOrigin-RevId: 477955264 Source-Link: https://togithub.com/googleapis/googleapis/commit/a724450af76d0001f23602684c49cd6a4b3a5654 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/4abcbcaec855e74a0b22a4988cf9e0eb61a83094 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGFiY2JjYWVjODU1ZTc0YTBiMjJhNDk4OGNmOWUwZWI2MWE4MzA5NCJ9

… v3.5.6 (googleapis#817) [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-build](https://togithub.com/googleapis/java-cloudbuild) | `3.5.5` -> `3.5.6` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-build/3.5.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-build/3.5.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-build/3.5.6/compatibility-slim/3.5.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-build/3.5.6/confidence-slim/3.5.5)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-cloudbuild).

…-info-reports-plugin to v3.3.0 (#817) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-project-info-reports-plugin](https://maven.apache.org/plugins/) | `3.2.2` -> `3.3.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.3.0/compatibility-slim/3.2.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.3.0/confidence-slim/3.2.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-core).

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [protobuf](https://developers.google.com/protocol-buffers/) | `==3.19.5` -> `==4.21.6` | [![age](https://badges.renovateapi.com/packages/pypi/protobuf/4.21.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/protobuf/4.21.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/protobuf/4.21.6/compatibility-slim/3.19.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/protobuf/4.21.6/confidence-slim/3.19.5)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-dependencies).

mderka and others added 30 commits February 1, 2016 19:31

Merge pull request googleapis#597 from mderka/dns-options

c5566eb

Creates DnsService interface and DnsOptions

Added Dns methods. Fixes googleapis#596. Added Zone and ZoneTest

a69101a

Rename TableDefinition to StandardTableDefinition and BaseTableDefini…

28a457e

…tion to TableDefinition

Merge pull request googleapis#600 from mziccard/bigquery-hierachies

2bb03eb

Remove TableInfo hierarchy, add TableType hierarchy

Make bigquery functional classes extend info classes

b0c0bb7

- Dataset extends DatasetInfo - Table extends TableInfo - Job extends JobInfo - Update READMEs and snippets - Update BigQueryExample - Update and add more tests

Fixed documentation and some code formatting. Declared exceptions to be

e083dfd

thrown when parent objects do not exist. Changed contracts of applyChangeRequest and getChangeRequest methods. Adjusted tests.

Adjusted documentation, removed getProjectId and getProjectNumber

d6daf09

Merge pull request googleapis#606 from mderka/dns-options

e3686e3

Added Dns methods, Zone and ZoneTest. Fixes googleapis#596.

Make functional objects subclasses of metadata objects.

3d1c1c8

Minor refactoring bigquery functional objects

94533b2

- Make Builder public - Make Dataset.builder package scope - Add toAndFromPb test - Remove static get methods

Add functional classes to SerializationTest

5829d81

Completes DnsRpc interface by adding methods and doc.

0338ead

Closes googleapis#594.

Implements DefaultDnsRpc. Progress in googleapis#595.

bc4b820

Fixed documentation and null returns from rpc.

896de75

minor fixes

aa0e377

Add toBuilder tests for Bucket and Blob, remove static get and builde…

6870eb7

…r methods from Resource Manager's Project

Add builder test to increase coverage

75dbbf8

Refactor bigquery function objects builders

b6ad451

- Remove static builder methods - Add builder methods params to builder constructors - Better javadoc for builder classes

Add missing override annotation and serialVersionUID

fbcbfb4

Change Tuple<X,Y> into ListResult<X>, added NAME option.

3ae0f21

Merge pull request googleapis#609 from mziccard/bigquery-hierachies

4bf3796

Make bigquery functional classes extend info classes

Merge pull request googleapis#616 from mderka/dns-options

35dbb34

Completes DnsRpc interface by adding methods and doc. Implements DefaultDnsRpc.

try latest version of coveralls

ae7e62e

Makes name of Zone mandatory and removes id-based methods.

71f5ae2

Also makes id a read-only string instead of BigInteger. Includes rewriting testsfor Zone.

Added field options for zone create method.

3183f4a

Fixed doc after refactoring. Made zone name mandatory in fields.

4057dcd

Make Table methods public

7761a9e

Fix the 'Definition of groupId is redundant' mvn warning

3ce2cc6

Merge pull request googleapis#622 from mziccard/fix-groupid-warning

f7990c0

Fix the 'Definition of groupId is redundant' mvn warning

Merge pull request googleapis#621 from mziccard/bigquery-hierachies

8ba9230

Make Table methods public

aozarov and others added 7 commits March 28, 2016 19:28

update pom.xml to include DNS in javadoc groups

4ee0e32

Merge pull request googleapis#802 from aozarov/master

249cac6

update pom.xml to include DNS in javadoc groups

Add pkg info for dns

7849e6e

Merge pull request googleapis#805 from ajkannan/dns-testing-pkg-info

2819942

Add package info for dns.testing

Add comment about releasing new modules

69476eb

Merge pull request googleapis#806 from ajkannan/releasing-new-module

6747274

Add comment about releasing new modules

Merge conflict resolution.

2b52294

ajkannan added the api: datastore Issues related to the Datastore API. label Mar 29, 2016

googlebot added the cla: no This human has *not* signed the Contributor License Agreement. label Mar 29, 2016

aozarov added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Mar 30, 2016

ajkannan merged commit 1ca9616 into googleapis:update-datastore Mar 30, 2016

ajkannan deleted the bring-v1beta3-up-to-speed branch March 30, 2016 00:16

github-actions bot pushed a commit that referenced this pull request Jun 21, 2022

chore: include generated samples dir (#817)

eb3b703

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update v1beta3 branch with master's most recent changes #817

Update v1beta3 branch with master's most recent changes #817

ajkannan commented Mar 29, 2016

googlebot commented Mar 29, 2016

coveralls commented Mar 29, 2016

aozarov commented Mar 30, 2016

Update v1beta3 branch with master's most recent changes #817

Update v1beta3 branch with master's most recent changes #817

Conversation

ajkannan commented Mar 29, 2016

googlebot commented Mar 29, 2016

coveralls commented Mar 29, 2016

aozarov commented Mar 30, 2016