From d3b883d94c546c0424b7c5a74ea2b02e3d902d8d Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 29 Mar 2019 00:51:09 -0700 Subject: [PATCH] Regenerate os-login client --- .../cloud/oslogin/common/OsLoginProto.java | 70 +++++++++---------- .../oslogin/v1/DeletePosixAccountRequest.java | 23 +++--- .../oslogin/v1/DeleteSshPublicKeyRequest.java | 23 +++--- .../oslogin/v1/GetLoginProfileRequest.java | 23 +++--- .../oslogin/v1/GetSshPublicKeyRequest.java | 23 +++--- .../oslogin/v1/ImportSshPublicKeyRequest.java | 31 ++++---- .../v1/ImportSshPublicKeyResponse.java | 27 ++++--- .../google/cloud/oslogin/v1/LoginProfile.java | 42 ++++++----- .../oslogin/v1/UpdateSshPublicKeyRequest.java | 35 +++++----- .../google-cloud-os-login/synth.metadata | 10 +-- 10 files changed, 146 insertions(+), 161 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java index dcdb72fdb6ef..7029db4c5d48 100644 --- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java +++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java @@ -198,10 +198,7 @@ private PosixAccount(com.google.protobuf.GeneratedMessageV3.Builder builder) } private PosixAccount() { - primary_ = false; username_ = ""; - uid_ = 0L; - gid_ = 0L; homeDirectory_ = ""; shell_ = ""; gecos_ = ""; @@ -292,7 +289,7 @@ private PosixAccount( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -722,18 +719,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.oslogin.common.OsLoginProto.PosixAccount other = (com.google.cloud.oslogin.common.OsLoginProto.PosixAccount) obj; - boolean result = true; - result = result && (getPrimary() == other.getPrimary()); - result = result && getUsername().equals(other.getUsername()); - result = result && (getUid() == other.getUid()); - result = result && (getGid() == other.getGid()); - result = result && getHomeDirectory().equals(other.getHomeDirectory()); - result = result && getShell().equals(other.getShell()); - result = result && getGecos().equals(other.getGecos()); - result = result && getSystemId().equals(other.getSystemId()); - result = result && getAccountId().equals(other.getAccountId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getPrimary() != other.getPrimary()) return false; + if (!getUsername().equals(other.getUsername())) return false; + if (getUid() != other.getUid()) return false; + if (getGid() != other.getGid()) return false; + if (!getHomeDirectory().equals(other.getHomeDirectory())) return false; + if (!getShell().equals(other.getShell())) return false; + if (!getGecos().equals(other.getGecos())) return false; + if (!getSystemId().equals(other.getSystemId())) return false; + if (!getAccountId().equals(other.getAccountId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -969,23 +965,23 @@ public com.google.cloud.oslogin.common.OsLoginProto.PosixAccount buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -993,13 +989,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1782,7 +1778,7 @@ public Builder setAccountIdBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1914,7 +1910,6 @@ private SshPublicKey(com.google.protobuf.GeneratedMessageV3.Builder builder) private SshPublicKey() { key_ = ""; - expirationTimeUsec_ = 0L; fingerprint_ = ""; } @@ -1963,7 +1958,7 @@ private SshPublicKey( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2157,12 +2152,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey other = (com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey) obj; - boolean result = true; - result = result && getKey().equals(other.getKey()); - result = result && (getExpirationTimeUsec() == other.getExpirationTimeUsec()); - result = result && getFingerprint().equals(other.getFingerprint()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKey().equals(other.getKey())) return false; + if (getExpirationTimeUsec() != other.getExpirationTimeUsec()) return false; + if (!getFingerprint().equals(other.getFingerprint())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2368,23 +2362,23 @@ public com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -2392,13 +2386,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2700,7 +2694,7 @@ public Builder setFingerprintBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java index be496f4c0b22..e6e135184622 100644 --- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java +++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java @@ -59,7 +59,7 @@ private DeletePosixAccountRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.oslogin.v1.DeletePosixAccountRequest other = (com.google.cloud.oslogin.v1.DeletePosixAccountRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.cloud.oslogin.v1.DeletePosixAccountRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -564,7 +563,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java index e98232e8cdb2..f19739872876 100644 --- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java +++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java @@ -59,7 +59,7 @@ private DeleteSshPublicKeyRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest other = (com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -564,7 +563,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java index 43143aed6661..5263503d1867 100644 --- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java +++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java @@ -59,7 +59,7 @@ private GetLoginProfileRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -179,10 +179,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.oslogin.v1.GetLoginProfileRequest other = (com.google.cloud.oslogin.v1.GetLoginProfileRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -375,35 +374,35 @@ public com.google.cloud.oslogin.v1.GetLoginProfileRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -549,7 +548,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java index 7e86e69b422f..13566399f419 100644 --- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java +++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java @@ -59,7 +59,7 @@ private GetSshPublicKeyRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.oslogin.v1.GetSshPublicKeyRequest other = (com.google.cloud.oslogin.v1.GetSshPublicKeyRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +378,35 @@ public com.google.cloud.oslogin.v1.GetSshPublicKeyRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -563,7 +562,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java index 38ba8b88d496..ef1e4cafa635 100644 --- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java +++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java @@ -84,7 +84,7 @@ private ImportSshPublicKeyRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -301,15 +301,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest other = (com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasSshPublicKey() == other.hasSshPublicKey()); + if (!getParent().equals(other.getParent())) return false; + if (hasSshPublicKey() != other.hasSshPublicKey()) return false; if (hasSshPublicKey()) { - result = result && getSshPublicKey().equals(other.getSshPublicKey()); + if (!getSshPublicKey().equals(other.getSshPublicKey())) return false; } - result = result && getProjectId().equals(other.getProjectId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -523,35 +522,35 @@ public com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -702,7 +701,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey sshPublicKey_ = null; + private com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey sshPublicKey_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey, com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey.Builder, @@ -984,7 +983,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java index b6df47e5b38f..751041f82e54 100644 --- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java +++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java @@ -66,7 +66,7 @@ private ImportSshPublicKeyResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -184,13 +184,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse other = (com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse) obj; - boolean result = true; - result = result && (hasLoginProfile() == other.hasLoginProfile()); + if (hasLoginProfile() != other.hasLoginProfile()) return false; if (hasLoginProfile()) { - result = result && getLoginProfile().equals(other.getLoginProfile()); + if (!getLoginProfile().equals(other.getLoginProfile())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -394,35 +393,35 @@ public com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -471,7 +470,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.oslogin.v1.LoginProfile loginProfile_ = null; + private com.google.cloud.oslogin.v1.LoginProfile loginProfile_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.oslogin.v1.LoginProfile, com.google.cloud.oslogin.v1.LoginProfile.Builder, @@ -655,7 +654,7 @@ public com.google.cloud.oslogin.v1.LoginProfileOrBuilder getLoginProfileOrBuilde @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java index aa7f5183af2f..c81f938ebd3a 100644 --- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java +++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java @@ -26,7 +26,6 @@ private LoginProfile(com.google.protobuf.GeneratedMessageV3.Builder builder) private LoginProfile() { name_ = ""; posixAccounts_ = java.util.Collections.emptyList(); - suspended_ = false; } @java.lang.Override @@ -62,7 +61,7 @@ private LoginProfile( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { posixAccounts_ = new java.util.ArrayList< com.google.cloud.oslogin.common.OsLoginProto.PosixAccount>(); @@ -76,7 +75,7 @@ private LoginProfile( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { sshPublicKeys_ = com.google.protobuf.MapField.newMapField( SshPublicKeysDefaultEntryHolder.defaultEntry); @@ -100,7 +99,7 @@ private LoginProfile( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -112,7 +111,7 @@ private LoginProfile( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { posixAccounts_ = java.util.Collections.unmodifiableList(posixAccounts_); } this.unknownFields = unknownFields.build(); @@ -454,13 +453,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.oslogin.v1.LoginProfile other = (com.google.cloud.oslogin.v1.LoginProfile) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getPosixAccountsList().equals(other.getPosixAccountsList()); - result = result && internalGetSshPublicKeys().equals(other.internalGetSshPublicKeys()); - result = result && (getSuspended() == other.getSuspended()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getPosixAccountsList().equals(other.getPosixAccountsList())) return false; + if (!internalGetSshPublicKeys().equals(other.internalGetSshPublicKeys())) return false; + if (getSuspended() != other.getSuspended()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -692,7 +690,7 @@ public com.google.cloud.oslogin.v1.LoginProfile buildPartial() { int to_bitField0_ = 0; result.name_ = name_; if (posixAccountsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { posixAccounts_ = java.util.Collections.unmodifiableList(posixAccounts_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -710,35 +708,35 @@ public com.google.cloud.oslogin.v1.LoginProfile buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -917,7 +915,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { posixAccounts_ = java.util.Collections.emptyList(); private void ensurePosixAccountsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { posixAccounts_ = new java.util.ArrayList( posixAccounts_); @@ -1275,7 +1273,7 @@ public Builder removePosixAccounts(int index) { com.google.cloud.oslogin.common.OsLoginProto.PosixAccount.Builder, com.google.cloud.oslogin.common.OsLoginProto.PosixAccountOrBuilder>( posixAccounts_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); posixAccounts_ = null; @@ -1511,7 +1509,7 @@ public Builder clearSuspended() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java index 1abc75bbc77f..901f6384625b 100644 --- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java +++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java @@ -91,7 +91,7 @@ private UpdateSshPublicKeyRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -308,18 +308,17 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest other = (com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasSshPublicKey() == other.hasSshPublicKey()); + if (!getName().equals(other.getName())) return false; + if (hasSshPublicKey() != other.hasSshPublicKey()) return false; if (hasSshPublicKey()) { - result = result && getSshPublicKey().equals(other.getSshPublicKey()); + if (!getSshPublicKey().equals(other.getSshPublicKey())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -543,35 +542,35 @@ public com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -731,7 +730,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey sshPublicKey_ = null; + private com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey sshPublicKey_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey, com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey.Builder, @@ -917,7 +916,7 @@ public Builder clearSshPublicKey() { return sshPublicKeyBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1098,7 +1097,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-cloud-clients/google-cloud-os-login/synth.metadata b/google-cloud-clients/google-cloud-os-login/synth.metadata index c3ec97c890b4..c18dbe910eab 100644 --- a/google-cloud-clients/google-cloud-os-login/synth.metadata +++ b/google-cloud-clients/google-cloud-os-login/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:50:32.379579Z", + "updateTime": "2019-03-29T07:51:08.788030Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.20", - "dockerImage": "googleapis/artman@sha256:e3c054a2fb85a12481c722af616c7fb6f1d02d862248385eecbec3e4240ebd1e" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "6a84b3267b0a95e922608b9891219075047eee29", - "internalRef": "240640999" + "sha": "37386f1ebcaed51bcb7d15d00124d22c38606e45", + "internalRef": "240841842" } } ],