Skip to content
Permalink
Browse files
fix: Fix the resource annotations for GetRepositoryRequest (#171)
- [x] Regenerate this pull request now.

BREAKING CHANGE: This will be a breaking change for languages that generate client libraries using resource annotations to provide overloads accepting resource names. Where previously such languages would have generated (in-pseudocode) GetRepository(LocationName) they will now (correctly) generate GetRepository(RepositoryName). Code using the older methods will be broken by this change, but would never have worked anyway.

PiperOrigin-RevId: 403028264

Source-Link: googleapis/googleapis@9bac62d

Source-Link: https://github.com/googleapis/googleapis-gen/commit/4f54454b649bcedea14bb01955a65850ce906d9b
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGY1NDQ1NGI2NDliY2VkZWExNGJiMDE5NTVhNjU4NTBjZTkwNmQ5YiJ9
  • Loading branch information
gcf-owl-bot[bot] committed Oct 21, 2021
1 parent e97c22c commit dd2adb5df54f44734077b99aa9bb859f9bff8a51
Showing with 117 additions and 117 deletions.
  1. +12 −12 ...cloud-artifact-registry-v1/src/main/java/com/google/devtools/artifactregistry/v1/DockerImage.java
  2. +2 −2 ...ifact-registry-v1/src/main/java/com/google/devtools/artifactregistry/v1/GetRepositoryRequest.java
  3. +4 −4 ...ct-registry-v1/src/main/java/com/google/devtools/artifactregistry/v1/ListDockerImagesRequest.java
  4. +2 −2 ...t-registry-v1/src/main/java/com/google/devtools/artifactregistry/v1/ListDockerImagesResponse.java
  5. +4 −4 ...ct-registry-v1/src/main/java/com/google/devtools/artifactregistry/v1/ListRepositoriesRequest.java
  6. +2 −2 ...t-registry-v1/src/main/java/com/google/devtools/artifactregistry/v1/ListRepositoriesResponse.java
  7. +6 −6 ...-cloud-artifact-registry-v1/src/main/java/com/google/devtools/artifactregistry/v1/Repository.java
  8. +3 −3 ...ogle-cloud-artifact-registry-v1/src/main/proto/google/devtools/artifactregistry/v1/artifact.proto
  9. +4 −4 ...y-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/CreateRepositoryRequest.java
  10. +4 −4 ...registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/CreateTagRequest.java
  11. +2 −2 ...stry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/DeletePackageRequest.java
  12. +2 −2 ...y-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/DeleteRepositoryRequest.java
  13. +2 −2 ...registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/DeleteTagRequest.java
  14. +2 −2 ...stry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/DeleteVersionRequest.java
  15. +4 −4 ...ud-artifact-registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/File.java
  16. +2 −2 ...t-registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/GetFileRequest.java
  17. +2 −2 ...egistry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/GetPackageRequest.java
  18. +2 −2 ...stry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/GetRepositoryRequest.java
  19. +2 −2 ...ct-registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/GetTagRequest.java
  20. +2 −2 ...egistry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/GetVersionRequest.java
  21. +6 −6 ...registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/ListFilesRequest.java
  22. +2 −2 ...egistry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/ListFilesResponse.java
  23. +4 −4 ...istry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/ListPackagesRequest.java
  24. +2 −2 ...stry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/ListPackagesResponse.java
  25. +4 −4 ...y-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/ListRepositoriesRequest.java
  26. +2 −2 ...-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/ListRepositoriesResponse.java
  27. +6 −6 ...-registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/ListTagsRequest.java
  28. +2 −2 ...registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/ListTagsResponse.java
  29. +4 −4 ...istry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/ListVersionsRequest.java
  30. +2 −2 ...stry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/ListVersionsResponse.java
  31. +4 −4 ...artifact-registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/Package.java
  32. +6 −6 ...ifact-registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/Repository.java
  33. +4 −4 ...oud-artifact-registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/Tag.java
  34. +4 −4 ...artifact-registry-v1beta2/src/main/java/com/google/devtools/artifactregistry/v1beta2/Version.java
@@ -25,9 +25,9 @@
* DockerImage represents a docker artifact.
* The following fields are returned as untyped metadata in the Version
* resource, using camelcase keys (i.e. metadata.imageSizeBytes):
* * imageSizeBytes
* * mediaType
* * buildTime
* - imageSizeBytes
* - mediaType
* - buildTime
* </pre>
*
* Protobuf type {@code google.devtools.artifactregistry.v1.DockerImage}
@@ -556,10 +556,10 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) {
if (!getUriBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, uri_);
}
for (int i = 0; i < tags_.size(); i++) {
@@ -571,7 +571,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (uploadTime_ != null) {
output.writeMessage(5, getUploadTime());
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(mediaType_)) {
if (!getMediaTypeBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 6, mediaType_);
}
if (buildTime_ != null) {
@@ -586,10 +586,10 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) {
if (!getUriBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, uri_);
}
{
@@ -606,7 +606,7 @@ public int getSerializedSize() {
if (uploadTime_ != null) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getUploadTime());
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(mediaType_)) {
if (!getMediaTypeBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, mediaType_);
}
if (buildTime_ != null) {
@@ -779,9 +779,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
* DockerImage represents a docker artifact.
* The following fields are returned as untyped metadata in the Version
* resource, using camelcase keys (i.e. metadata.imageSizeBytes):
* * imageSizeBytes
* * mediaType
* * buildTime
* - imageSizeBytes
* - mediaType
* - buildTime
* </pre>
*
* Protobuf type {@code google.devtools.artifactregistry.v1.DockerImage}
@@ -178,7 +178,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
unknownFields.writeTo(output);
@@ -190,7 +190,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
size += unknownFields.getSerializedSize();
@@ -254,13 +254,13 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
if (!getParentBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
}
if (pageSize_ != 0) {
output.writeInt32(2, pageSize_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
if (!getPageTokenBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
}
unknownFields.writeTo(output);
@@ -272,13 +272,13 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
if (!getParentBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
}
if (pageSize_ != 0) {
size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, pageSize_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
if (!getPageTokenBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
}
size += unknownFields.getSerializedSize();
@@ -267,7 +267,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
for (int i = 0; i < dockerImages_.size(); i++) {
output.writeMessage(1, dockerImages_.get(i));
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
if (!getNextPageTokenBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
}
unknownFields.writeTo(output);
@@ -282,7 +282,7 @@ public int getSerializedSize() {
for (int i = 0; i < dockerImages_.size(); i++) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, dockerImages_.get(i));
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
if (!getNextPageTokenBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
}
size += unknownFields.getSerializedSize();
@@ -258,13 +258,13 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
if (!getParentBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
}
if (pageSize_ != 0) {
output.writeInt32(2, pageSize_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
if (!getPageTokenBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
}
unknownFields.writeTo(output);
@@ -276,13 +276,13 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
if (!getParentBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
}
if (pageSize_ != 0) {
size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, pageSize_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pageToken_)) {
if (!getPageTokenBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
}
size += unknownFields.getSerializedSize();
@@ -267,7 +267,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
for (int i = 0; i < repositories_.size(); i++) {
output.writeMessage(1, repositories_.get(i));
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
if (!getNextPageTokenBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nextPageToken_);
}
unknownFields.writeTo(output);
@@ -282,7 +282,7 @@ public int getSerializedSize() {
for (int i = 0; i < repositories_.size(); i++) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, repositories_.get(i));
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextPageToken_)) {
if (!getNextPageTokenBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nextPageToken_);
}
size += unknownFields.getSerializedSize();
@@ -850,15 +850,15 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
if (format_
!= com.google.devtools.artifactregistry.v1.Repository.Format.FORMAT_UNSPECIFIED
.getNumber()) {
output.writeEnum(2, format_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
if (!getDescriptionBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, description_);
}
com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(
@@ -869,7 +869,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (updateTime_ != null) {
output.writeMessage(6, getUpdateTime());
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kmsKeyName_)) {
if (!getKmsKeyNameBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, kmsKeyName_);
}
unknownFields.writeTo(output);
@@ -881,15 +881,15 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
if (format_
!= com.google.devtools.artifactregistry.v1.Repository.Format.FORMAT_UNSPECIFIED
.getNumber()) {
size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, format_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
if (!getDescriptionBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, description_);
}
for (java.util.Map.Entry<java.lang.String, java.lang.String> entry :
@@ -908,7 +908,7 @@ public int getSerializedSize() {
if (updateTime_ != null) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getUpdateTime());
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kmsKeyName_)) {
if (!getKmsKeyNameBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, kmsKeyName_);
}
size += unknownFields.getSerializedSize();
@@ -32,9 +32,9 @@ option ruby_package = "Google::Cloud::ArtifactRegistry::V1";
// DockerImage represents a docker artifact.
// The following fields are returned as untyped metadata in the Version
// resource, using camelcase keys (i.e. metadata.imageSizeBytes):
// * imageSizeBytes
// * mediaType
// * buildTime
// - imageSizeBytes
// - mediaType
// - buildTime
message DockerImage {
option (google.api.resource) = {
type: "artifactregistry.googleapis.com/DockerImage"
@@ -296,10 +296,10 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
if (!getParentBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(repositoryId_)) {
if (!getRepositoryIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, repositoryId_);
}
if (repository_ != null) {
@@ -314,10 +314,10 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
if (!getParentBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(repositoryId_)) {
if (!getRepositoryIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, repositoryId_);
}
if (repository_ != null) {
@@ -295,10 +295,10 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
if (!getParentBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tagId_)) {
if (!getTagIdBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, tagId_);
}
if (tag_ != null) {
@@ -313,10 +313,10 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(parent_)) {
if (!getParentBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, parent_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tagId_)) {
if (!getTagIdBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, tagId_);
}
if (tag_ != null) {
@@ -174,7 +174,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
unknownFields.writeTo(output);
@@ -186,7 +186,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
size += unknownFields.getSerializedSize();
@@ -174,7 +174,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
unknownFields.writeTo(output);
@@ -186,7 +186,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
size += unknownFields.getSerializedSize();
@@ -174,7 +174,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
unknownFields.writeTo(output);
@@ -186,7 +186,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
size += unknownFields.getSerializedSize();
@@ -198,7 +198,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
}
if (force_ != false) {
@@ -213,7 +213,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
if (!getNameBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
}
if (force_ != false) {

0 comments on commit dd2adb5

Please sign in to comment.