Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull changes from master #598

Merged
merged 464 commits into from
Feb 2, 2016

Conversation

ajkannan
Copy link

The purpose of this PR is to reduce the delta between the update-datastore branch and master to facilitate easier merging into master when v1beta3 is released. The last two commits include merge conflict resolution.

Ajay Kannan and others added 30 commits December 2, 2015 14:53
- Move schema from TableInfo to TableType
- Add TableType.View class with attributes: view, userDefinedFunctions
- Add TableType.ExternalTable class with attributes: ExternalDataConfiguration
- Fix return null in TableInfo.description/friendlyName/expirationTime
Add TableInfo and related model classes
Add JobInfo hierarcy and related classes
Specify HTTP Transport in DefaultDatastoreRpc
- Add static FROM_PB_FUNCTION in FieldValue
- Rename Kind to Attribute in FieldValue
- Add isNull() and document NPEs in FieldValue getters
- Change has type to is a type in FieldValue
- Copy row content in RowToInsert constructor
- Add factory method for null id to RowToInsert
- Use isEmpty() instead of size() > 0 in InsertAllResponse
- Better unit testing
Add InsertAllRequest, InsertAllResponse and model classes for table data
- Add better javadoc and snippet to QueryResponse
- Use primitive boolean for jobComplete
- Add test for NPE in QueryRequestTests
- Add QueryRequest and QueryResponse to SerializationTest
Add query request and query response classes and tests
@ajkannan ajkannan removed the cla: no This human has *not* signed the Contributor License Agreement. label Jan 29, 2016
@googlebot googlebot added cla: no This human has *not* signed the Contributor License Agreement. and removed cla: yes This human has signed the Contributor License Agreement. labels Jan 29, 2016
@ajkannan ajkannan 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 Jan 29, 2016
@ajkannan
Copy link
Author

ajkannan commented Feb 2, 2016

Noticed one issue: the merge didn't take the master's up-to-date ServiceOptions.Builder.projectId(String projectId) method, instead taking the update-datastore version. Will fix in next commit.

@googlebot googlebot added cla: no This human has *not* signed the Contributor License Agreement. and removed cla: yes This human has signed the Contributor License Agreement. labels Feb 2, 2016
@ajkannan ajkannan force-pushed the update-datastore branch 2 times, most recently from 8dcbff0 to d9590ea Compare February 2, 2016 17:28
@ajkannan
Copy link
Author

ajkannan commented Feb 2, 2016

In addition to fixing merge conflicts, the following changes were applied:

  • Change the retry codes from HTTP codes to gRPC ordinal codes.
  • Remove unnecessary "protected" modifier from two DateTime functions.
  • Set QueryResults.cursorAfter to be the batch's endCursor when we run out of results.
  • Fix update-datastore's ServiceOptions to accept null project ID.

…rom DateTime, set cursorAfter to endCursor where appropriate, and fix error codes for retries.
@ajkannan ajkannan 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 Feb 2, 2016
aozarov added a commit that referenced this pull request Feb 2, 2016
@aozarov aozarov merged commit 667e606 into googleapis:update-datastore Feb 2, 2016
@ajkannan ajkannan deleted the update-datastore branch February 6, 2016 02:19
github-actions bot pushed a commit to suztomo/google-cloud-java that referenced this pull request Jun 29, 2022
…onfig to v1.0.1 (googleapis#598)

[![WhiteSource 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.0.0` -> `1.0.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.1/compatibility-slim/1.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.1/confidence-slim/1.0.0)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes

<details>
<summary>googleapis/java-shared-config</summary>

### [`v1.0.1`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#&#8203;101-httpswwwgithubcomgoogleapisjava-shared-configcomparev100v101-2021-08-18)

[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.0.0...v1.0.1)

</details>

---

### 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.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.

---

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-resourcemanager).
github-actions bot pushed a commit that referenced this pull request Oct 5, 2022
🤖 I have created a release *beep* *boop*
---


## [0.10.4](https://togithub.com/googleapis/java-recommendations-ai/compare/v0.10.3...v0.10.4) (2022-10-03)


### Bug Fixes

* Fix recommendationengine resource name configuration ([#572](https://togithub.com/googleapis/java-recommendations-ai/issues/572)) ([2beea62](https://togithub.com/googleapis/java-recommendations-ai/commit/2beea629b8bd0dc2e0b934dac0c9a7c728ef71c1))


### Dependencies

* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 ([#574](https://togithub.com/googleapis/java-recommendations-ai/issues/574)) ([a7266ef](https://togithub.com/googleapis/java-recommendations-ai/commit/a7266ef9f0ad3a4be8222825b44025641cea63ba))
* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 ([#601](https://togithub.com/googleapis/java-recommendations-ai/issues/601)) ([6fa10e1](https://togithub.com/googleapis/java-recommendations-ai/commit/6fa10e1206e125891b58cad6f78f1bdfeae247d4))
* Update dependency importlib-metadata to v4.12.0 ([#596](https://togithub.com/googleapis/java-recommendations-ai/issues/596)) ([cd541e7](https://togithub.com/googleapis/java-recommendations-ai/commit/cd541e72d4b0ac5a71aedf42f743ef66da7c191e))
* Update dependency jeepney to v0.8.0 ([#597](https://togithub.com/googleapis/java-recommendations-ai/issues/597)) ([32c3a1f](https://togithub.com/googleapis/java-recommendations-ai/commit/32c3a1f9e437a37fbc46981f8d0984d01d2b1785))
* Update dependency jinja2 to v3.1.2 ([#598](https://togithub.com/googleapis/java-recommendations-ai/issues/598)) ([6070770](https://togithub.com/googleapis/java-recommendations-ai/commit/6070770d7653bd1c5c33ddf717c6062926015882))
* Update dependency keyring to v23.9.3 ([#599](https://togithub.com/googleapis/java-recommendations-ai/issues/599)) ([454ca90](https://togithub.com/googleapis/java-recommendations-ai/commit/454ca90c112eb7c7da53a75ebf1cd31351af9c45))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
suztomo pushed a commit that referenced this pull request Feb 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api: datastore Issues related to the Datastore API. cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants