Fix merge mishap #741

jean-philippe-martin · 2016-03-10T18:35:17Z

Sorry! I don't know how that slipped by!

aozarov · 2016-03-10T18:43:51Z

Looks like there are more merge issues? See Travis logs.

jean-philippe-martin · 2016-03-10T19:07:31Z

How can I reproduce the problem? The log suggests that mvn clean triggers the problem, but for me it doesn't.

I tried mvn clean and mvn clean compile test, both worked fine.

jean-philippe-martin · 2016-03-10T19:22:18Z

OK this is super weird. I just tried mvn compile and it returned success, including GCloud Java NIO. However, when I rebuild this same project from the IDE I get an error about BlobInfo.Builder.size not being public (apparently true). mvn clean compile also worked, similarly reporting success in compiling this code.

Clearly there is something wrong in my mental model about what's going on here. Would you have some wisdom to share?

jean-philippe-martin · 2016-03-10T20:40:59Z

The core problem with this merge appears to be that the Storage.get interface was changed to return a Blob instead of a BlobInfo, and there is no way to create a mock Blob to return. So I had to change its interface a little bit to allow us to still test against it.

Please have a look; you might prefer doing things differently, such as adding a static "builder" method to the Blob class.

aozarov · 2016-03-10T21:59:08Z

Blob is final, it cannot be mocked. Will revisit later.

Good point. Though there are testing frameworks that supports mocking final classes (such as powermock). I think we can (and should) relax that.

aozarov · 2016-03-10T22:00:05Z

when we do so, we should make equals and hashCode final.

Create service-specific spi packages

Use groups to separate packages in javadoc's index

So we can mock it in test classes. Also make equals and hashCode final.

…inal Remove final from Blob

googlebot · 2016-03-11T23:35:02Z

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.

jean-philippe-martin · 2016-03-11T23:47:02Z

Merging with master's now-not-final Blob class allowed us to mock the Blob, and then make things work. Two things of note in the process, though:

I had to change Blob.equals to short-circuit the pointer-equality case (probably a limitation of the mock system)
I had to put the java.nio.file.spi.FileSystemProvider file back; without it, the gs provider wasn't installed (as if AutoService mysteriously stopped working - I tried building multiple times)

jean-philippe-martin · 2016-03-14T16:47:33Z

Ready to merge as soon as I get the OK. Googlebot's warning seems spurious.

jean-philippe-martin · 2016-03-16T22:45:46Z

The issue I had was that tests would fail in the IDE (intelliJ in my case) even after building multiple times. If adding a redundant file allows us to run tests in the IDE then it's worthwhile, even though of course ideally we shouldn't need it.

aozarov · 2016-03-17T01:04:59Z

I verified that with my version of intelliJ (Community edition 2016.1) my tests pass fine without the meta file after I build the project (project is configured as a maven project).

Also, this should not be an issue for most people that depends on the gcs-nio jar directly.

However, if you still think we should keep the file then I see no reason for adding the auto-service dependency and using its annotation.

jean-philippe-martin · 2016-03-17T22:48:11Z

I had version 15.0.4. I updated to 2016.1 and this seems to have fixed the problem. I was able to build and test fine without the spi file, so I'm removing it.

Fix merge mishap

…4.0 (#741) [![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/GoogleCloudPlatform/cloud-opensource-java)) | `25.3.0` -> `25.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.4.0/compatibility-slim/25.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/25.4.0/confidence-slim/25.3.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 this update 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-container).

🤖 I have created a release *beep* *boop* --- ### [1.2.6](googleapis/java-resourcemanager@v1.2.5...v1.2.6) (2022-03-24) ### Dependencies * update dependency com.google.apis:google-api-services-cloudresourcemanager to v1-rev20220320-1.32.1 ([googleapis#740](googleapis/java-resourcemanager#740)) ([6907f85](googleapis/java-resourcemanager@6907f85)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

Making CLIRR not required. The version bumps are now controlled by the Release Please and OwlBot. The CL authors create appropriate change description to control major version bumps.

🤖 I have created a release *beep* *boop* --- ## [2.3.2](googleapis/java-billingbudgets@v2.3.1...v2.3.2) (2022-08-09) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v3 ([#738](googleapis/java-billingbudgets#738)) ([ce52ee9](googleapis/java-billingbudgets@ce52ee9)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

…-plugin to v3.4.1 (#741) [![Mend 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-javadoc-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.4.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.1/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.1/confidence-slim/3.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**: 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-tasks).

…ator_java versions (#741) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 472750037 Source-Link: googleapis/googleapis@88f2ea3 Source-Link: https://github.com/googleapis/googleapis-gen/commit/230a5588306aae18fe8f2a57f14d4039ad72c901 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjMwYTU1ODgzMDZhYWUxOGZlOGYyYTU3ZjE0ZDQwMzlhZDcyYzkwMSJ9

🤖 I have created a release *beep* *boop* --- ## [2.4.4](googleapis/java-texttospeech@v2.4.3...v2.4.4) (2022-09-15) ### Dependencies * Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.3 ([#740](googleapis/java-texttospeech#740)) ([14cfbaf](googleapis/java-texttospeech@14cfbaf)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

…race.Code (#741) - [ ] Regenerate this pull request now. fix: Added fix to return a list of the endpoints that encountered errors during crawl, along with the specific error message when the starting URL returns Http errors fix: GoogleAccount is deprecated PiperOrigin-RevId: 472758119 Source-Link: googleapis/googleapis@4356ba6 Source-Link: https://github.com/googleapis/googleapis-gen/commit/237042023f108b14c042711845241fbb62cf2e08 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjM3MDQyMDIzZjEwOGIxNGMwNDI3MTE4NDUyNDFmYmI2MmNmMmUwOCJ9 chore(bazel): Update WORKSPACE files for rules_gapic, gax_java, generator_java versions PiperOrigin-RevId: 472750037 Source-Link: googleapis/googleapis@88f2ea3 Source-Link: https://github.com/googleapis/googleapis-gen/commit/230a5588306aae18fe8f2a57f14d4039ad72c901 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjMwYTU1ODgzMDZhYWUxOGZlOGYyYTU3ZjE0ZDQwMzlhZDcyYzkwMSJ9

* chore(bazel): update protobuf to v3.21.7 PiperOrigin-RevId: 477955264 Source-Link: googleapis/googleapis@a724450 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4abcbcaec855e74a0b22a4988cf9e0eb61a83094 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGFiY2JjYWVjODU1ZTc0YTBiMjJhNDk4OGNmOWUwZWI2MWE4MzA5NCJ9 * 🦉 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>

…1.3 (googleapis#741) [![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.1.2` -> `26.1.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.3/compatibility-slim/26.1.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.3/confidence-slim/26.1.2)](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-dns).

…1.4 (#741) [![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.1.3` -> `26.1.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.4/compatibility-slim/26.1.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.1.4/confidence-slim/26.1.3)](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 this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- 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-billing).

#741) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 485623855 Source-Link: https://togithub.com/googleapis/googleapis/commit/807125e7953e32535710924fe4bf0362ac93754d Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/c4ddd6d651da69658a4762c5eafff5cd8f0e25c5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzRkZGQ2ZDY1MWRhNjk2NThhNDc2MmM1ZWFmZmY1Y2Q4ZjBlMjVjNSJ9

🤖 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).

… to v2.9.2 (#741)

Fix merge mishap

ab18107

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Mar 10, 2016

A stab in the dark

9dca6dd

mziccard and others added 2 commits March 10, 2016 21:22

Create service-specific spi packages

407c436

Add a way to create a mock Blob

d3555be

aozarov added api: storage Issues related to the Cloud Storage API. contrib labels Mar 10, 2016

mziccard and others added 11 commits March 10, 2016 23:02

Reorder and add imports

fd7d84d

Merge pull request googleapis#742 from mziccard/rename-spi

0d38c67

Create service-specific spi packages

Use groups to separate packages in javadoc's index

a595f6a

Add group for testing packages

90d0917

Rename Main packages to API packages, reorder groups, add service's SPIs

24a712a

Merge pull request googleapis#738 from mziccard/javadoc-group-packages

1425513

Use groups to separate packages in javadoc's index

in progress

b91fe9e

Remove final from Blob

8a3b4f2

So we can mock it in test classes. Also make equals and hashCode final.

Merge pull request googleapis#744 from jean-philippe-martin/blob_notf…

ddd02aa

…inal Remove final from Blob

Merge branch 'master' into gcs-nio-fix

f18a886

Adapt to changes from master

3d61bd1

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 Mar 11, 2016

Add FileSystemProvider, tests now pass

e65b2d8

aozarov removed the cla: no This human has *not* signed the Contributor License Agreement. label Mar 16, 2016

Remove spi.FileSystemProvider

a5e0286

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 Mar 17, 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 18, 2016

aozarov added a commit that referenced this pull request Mar 18, 2016

Merge pull request #741 from jean-philippe-martin/gcs-nio-fix

e85256c

Fix merge mishap

aozarov merged commit e85256c into googleapis:gcs-nio Mar 18, 2016

jean-philippe-martin deleted the gcs-nio-fix branch March 18, 2016 16:13

suztomo pushed a commit that referenced this pull request Feb 1, 2023

deps: update dependency com.google.api.grpc:grpc-google-common-protos…

347269f

… to v2.9.2 (#741)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix merge mishap #741

Fix merge mishap #741

jean-philippe-martin commented Mar 10, 2016

aozarov commented Mar 10, 2016

jean-philippe-martin commented Mar 10, 2016

jean-philippe-martin commented Mar 10, 2016

jean-philippe-martin commented Mar 10, 2016

aozarov commented Mar 10, 2016

aozarov commented Mar 10, 2016

googlebot commented Mar 11, 2016

jean-philippe-martin commented Mar 11, 2016

jean-philippe-martin commented Mar 14, 2016

jean-philippe-martin commented Mar 16, 2016

aozarov commented Mar 17, 2016

jean-philippe-martin commented Mar 17, 2016

Fix merge mishap #741

Fix merge mishap #741

Conversation

jean-philippe-martin commented Mar 10, 2016

aozarov commented Mar 10, 2016

jean-philippe-martin commented Mar 10, 2016

jean-philippe-martin commented Mar 10, 2016

jean-philippe-martin commented Mar 10, 2016

aozarov commented Mar 10, 2016

aozarov commented Mar 10, 2016

googlebot commented Mar 11, 2016

jean-philippe-martin commented Mar 11, 2016

jean-philippe-martin commented Mar 14, 2016

jean-philippe-martin commented Mar 16, 2016

aozarov commented Mar 17, 2016

jean-philippe-martin commented Mar 17, 2016