diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/BindDeviceToGatewayRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/BindDeviceToGatewayRequest.java index b084f5ff2d8b..c4026246bc52 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/BindDeviceToGatewayRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/BindDeviceToGatewayRequest.java @@ -75,7 +75,7 @@ private BindDeviceToGatewayRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -301,12 +301,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.BindDeviceToGatewayRequest other = (com.google.cloud.iot.v1.BindDeviceToGatewayRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getGatewayId().equals(other.getGatewayId()); - result = result && getDeviceId().equals(other.getDeviceId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getGatewayId().equals(other.getGatewayId())) return false; + if (!getDeviceId().equals(other.getDeviceId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -509,35 +508,35 @@ public com.google.cloud.iot.v1.BindDeviceToGatewayRequest 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 @@ -899,7 +898,7 @@ public Builder setDeviceIdBytes(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-iot-v1/src/main/java/com/google/cloud/iot/v1/BindDeviceToGatewayResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/BindDeviceToGatewayResponse.java index 14db5d1b0e3b..c32d01fd4d86 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/BindDeviceToGatewayResponse.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/BindDeviceToGatewayResponse.java @@ -49,7 +49,7 @@ private BindDeviceToGatewayResponse( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -120,9 +120,8 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.BindDeviceToGatewayResponse other = (com.google.cloud.iot.v1.BindDeviceToGatewayResponse) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -310,35 +309,35 @@ public com.google.cloud.iot.v1.BindDeviceToGatewayResponse 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 @@ -386,7 +385,7 @@ public Builder mergeFrom( @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-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java index 89c98a2cafb3..9ca60ae8c6da 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java @@ -75,7 +75,7 @@ private CreateDeviceRegistryRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -250,14 +250,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.CreateDeviceRegistryRequest other = (com.google.cloud.iot.v1.CreateDeviceRegistryRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasDeviceRegistry() == other.hasDeviceRegistry()); + if (!getParent().equals(other.getParent())) return false; + if (hasDeviceRegistry() != other.hasDeviceRegistry()) return false; if (hasDeviceRegistry()) { - result = result && getDeviceRegistry().equals(other.getDeviceRegistry()); + if (!getDeviceRegistry().equals(other.getDeviceRegistry())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -465,35 +464,35 @@ public com.google.cloud.iot.v1.CreateDeviceRegistryRequest 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 @@ -645,7 +644,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.iot.v1.DeviceRegistry deviceRegistry_ = null; + private com.google.cloud.iot.v1.DeviceRegistry deviceRegistry_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.DeviceRegistry, com.google.cloud.iot.v1.DeviceRegistry.Builder, @@ -847,7 +846,7 @@ public com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistryOrBuilde @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-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java index a4eab8191ddc..f8946adee021 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java @@ -74,7 +74,7 @@ private CreateDeviceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -249,14 +249,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.CreateDeviceRequest other = (com.google.cloud.iot.v1.CreateDeviceRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasDevice() == other.hasDevice()); + if (!getParent().equals(other.getParent())) return false; + if (hasDevice() != other.hasDevice()) return false; if (hasDevice()) { - result = result && getDevice().equals(other.getDevice()); + if (!getDevice().equals(other.getDevice())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -464,35 +463,35 @@ public com.google.cloud.iot.v1.CreateDeviceRequest 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 @@ -647,7 +646,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.iot.v1.Device device_ = null; + private com.google.cloud.iot.v1.Device device_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, @@ -842,7 +841,7 @@ public com.google.cloud.iot.v1.DeviceOrBuilder getDeviceOrBuilder() { @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-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java index 2175b6bdea7f..4e2f2ef3939b 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java @@ -59,7 +59,7 @@ private DeleteDeviceRegistryRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.DeleteDeviceRegistryRequest other = (com.google.cloud.iot.v1.DeleteDeviceRegistryRequest) 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 @@ -377,35 +376,35 @@ public com.google.cloud.iot.v1.DeleteDeviceRegistryRequest 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 @@ -556,7 +555,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-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java index a763045d6ac0..30c9216a3901 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java @@ -59,7 +59,7 @@ private DeleteDeviceRequest( } 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.iot.v1.DeleteDeviceRequest other = (com.google.cloud.iot.v1.DeleteDeviceRequest) 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.iot.v1.DeleteDeviceRequest 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 @@ -561,7 +560,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-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java index 77eece284093..e43780130fc1 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java @@ -25,9 +25,7 @@ private Device(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Device() { id_ = ""; name_ = ""; - numId_ = 0L; credentials_ = java.util.Collections.emptyList(); - blocked_ = false; logLevel_ = 0; } @@ -136,7 +134,7 @@ private Device( } case 98: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { credentials_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -194,7 +192,7 @@ private Device( } case 138: { - if (!((mutable_bitField0_ & 0x00008000) == 0x00008000)) { + if (!((mutable_bitField0_ & 0x00008000) != 0)) { metadata_ = com.google.protobuf.MapField.newMapField( MetadataDefaultEntryHolder.defaultEntry); @@ -267,7 +265,7 @@ private Device( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -279,7 +277,7 @@ private Device( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { credentials_ = java.util.Collections.unmodifiableList(credentials_); } this.unknownFields = unknownFields.build(); @@ -1306,56 +1304,55 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.iot.v1.Device other = (com.google.cloud.iot.v1.Device) obj; - boolean result = true; - result = result && getId().equals(other.getId()); - result = result && getName().equals(other.getName()); - result = result && (getNumId() == other.getNumId()); - result = result && getCredentialsList().equals(other.getCredentialsList()); - result = result && (hasLastHeartbeatTime() == other.hasLastHeartbeatTime()); + if (!getId().equals(other.getId())) return false; + if (!getName().equals(other.getName())) return false; + if (getNumId() != other.getNumId()) return false; + if (!getCredentialsList().equals(other.getCredentialsList())) return false; + if (hasLastHeartbeatTime() != other.hasLastHeartbeatTime()) return false; if (hasLastHeartbeatTime()) { - result = result && getLastHeartbeatTime().equals(other.getLastHeartbeatTime()); + if (!getLastHeartbeatTime().equals(other.getLastHeartbeatTime())) return false; } - result = result && (hasLastEventTime() == other.hasLastEventTime()); + if (hasLastEventTime() != other.hasLastEventTime()) return false; if (hasLastEventTime()) { - result = result && getLastEventTime().equals(other.getLastEventTime()); + if (!getLastEventTime().equals(other.getLastEventTime())) return false; } - result = result && (hasLastStateTime() == other.hasLastStateTime()); + if (hasLastStateTime() != other.hasLastStateTime()) return false; if (hasLastStateTime()) { - result = result && getLastStateTime().equals(other.getLastStateTime()); + if (!getLastStateTime().equals(other.getLastStateTime())) return false; } - result = result && (hasLastConfigAckTime() == other.hasLastConfigAckTime()); + if (hasLastConfigAckTime() != other.hasLastConfigAckTime()) return false; if (hasLastConfigAckTime()) { - result = result && getLastConfigAckTime().equals(other.getLastConfigAckTime()); + if (!getLastConfigAckTime().equals(other.getLastConfigAckTime())) return false; } - result = result && (hasLastConfigSendTime() == other.hasLastConfigSendTime()); + if (hasLastConfigSendTime() != other.hasLastConfigSendTime()) return false; if (hasLastConfigSendTime()) { - result = result && getLastConfigSendTime().equals(other.getLastConfigSendTime()); + if (!getLastConfigSendTime().equals(other.getLastConfigSendTime())) return false; } - result = result && (getBlocked() == other.getBlocked()); - result = result && (hasLastErrorTime() == other.hasLastErrorTime()); + if (getBlocked() != other.getBlocked()) return false; + if (hasLastErrorTime() != other.hasLastErrorTime()) return false; if (hasLastErrorTime()) { - result = result && getLastErrorTime().equals(other.getLastErrorTime()); + if (!getLastErrorTime().equals(other.getLastErrorTime())) return false; } - result = result && (hasLastErrorStatus() == other.hasLastErrorStatus()); + if (hasLastErrorStatus() != other.hasLastErrorStatus()) return false; if (hasLastErrorStatus()) { - result = result && getLastErrorStatus().equals(other.getLastErrorStatus()); + if (!getLastErrorStatus().equals(other.getLastErrorStatus())) return false; } - result = result && (hasConfig() == other.hasConfig()); + if (hasConfig() != other.hasConfig()) return false; if (hasConfig()) { - result = result && getConfig().equals(other.getConfig()); + if (!getConfig().equals(other.getConfig())) return false; } - result = result && (hasState() == other.hasState()); + if (hasState() != other.hasState()) return false; if (hasState()) { - result = result && getState().equals(other.getState()); + if (!getState().equals(other.getState())) return false; } - result = result && logLevel_ == other.logLevel_; - result = result && internalGetMetadata().equals(other.internalGetMetadata()); - result = result && (hasGatewayConfig() == other.hasGatewayConfig()); + if (logLevel_ != other.logLevel_) return false; + if (!internalGetMetadata().equals(other.internalGetMetadata())) return false; + if (hasGatewayConfig() != other.hasGatewayConfig()) return false; if (hasGatewayConfig()) { - result = result && getGatewayConfig().equals(other.getGatewayConfig()); + if (!getGatewayConfig().equals(other.getGatewayConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1697,7 +1694,7 @@ public com.google.cloud.iot.v1.Device buildPartial() { result.name_ = name_; result.numId_ = numId_; if (credentialsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { credentials_ = java.util.Collections.unmodifiableList(credentials_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1766,35 +1763,35 @@ public com.google.cloud.iot.v1.Device 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 @@ -2179,7 +2176,7 @@ public Builder clearNumId() { java.util.Collections.emptyList(); private void ensureCredentialsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { credentials_ = new java.util.ArrayList(credentials_); bitField0_ |= 0x00000008; @@ -2610,16 +2607,13 @@ public com.google.cloud.iot.v1.DeviceCredential.Builder addCredentialsBuilder(in com.google.cloud.iot.v1.DeviceCredential, com.google.cloud.iot.v1.DeviceCredential.Builder, com.google.cloud.iot.v1.DeviceCredentialOrBuilder>( - credentials_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + credentials_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); credentials_ = null; } return credentialsBuilder_; } - private com.google.protobuf.Timestamp lastHeartbeatTime_ = null; + private com.google.protobuf.Timestamp lastHeartbeatTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2836,7 +2830,7 @@ public com.google.protobuf.TimestampOrBuilder getLastHeartbeatTimeOrBuilder() { return lastHeartbeatTimeBuilder_; } - private com.google.protobuf.Timestamp lastEventTime_ = null; + private com.google.protobuf.Timestamp lastEventTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3035,7 +3029,7 @@ public com.google.protobuf.TimestampOrBuilder getLastEventTimeOrBuilder() { return lastEventTimeBuilder_; } - private com.google.protobuf.Timestamp lastStateTime_ = null; + private com.google.protobuf.Timestamp lastStateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3234,7 +3228,7 @@ public com.google.protobuf.TimestampOrBuilder getLastStateTimeOrBuilder() { return lastStateTimeBuilder_; } - private com.google.protobuf.Timestamp lastConfigAckTime_ = null; + private com.google.protobuf.Timestamp lastConfigAckTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3433,7 +3427,7 @@ public com.google.protobuf.TimestampOrBuilder getLastConfigAckTimeOrBuilder() { return lastConfigAckTimeBuilder_; } - private com.google.protobuf.Timestamp lastConfigSendTime_ = null; + private com.google.protobuf.Timestamp lastConfigSendTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3673,7 +3667,7 @@ public Builder clearBlocked() { return this; } - private com.google.protobuf.Timestamp lastErrorTime_ = null; + private com.google.protobuf.Timestamp lastErrorTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3872,7 +3866,7 @@ public com.google.protobuf.TimestampOrBuilder getLastErrorTimeOrBuilder() { return lastErrorTimeBuilder_; } - private com.google.rpc.Status lastErrorStatus_ = null; + private com.google.rpc.Status lastErrorStatus_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> lastErrorStatusBuilder_; @@ -4083,7 +4077,7 @@ public com.google.rpc.StatusOrBuilder getLastErrorStatusOrBuilder() { return lastErrorStatusBuilder_; } - private com.google.cloud.iot.v1.DeviceConfig config_ = null; + private com.google.cloud.iot.v1.DeviceConfig config_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.DeviceConfig, com.google.cloud.iot.v1.DeviceConfig.Builder, @@ -4300,7 +4294,7 @@ public com.google.cloud.iot.v1.DeviceConfigOrBuilder getConfigOrBuilder() { return configBuilder_; } - private com.google.cloud.iot.v1.DeviceState state_ = null; + private com.google.cloud.iot.v1.DeviceState state_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.DeviceState, com.google.cloud.iot.v1.DeviceState.Builder, @@ -4780,7 +4774,7 @@ public Builder putAllMetadata(java.util.Map return this; } - private com.google.cloud.iot.v1.GatewayConfig gatewayConfig_ = null; + private com.google.cloud.iot.v1.GatewayConfig gatewayConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.GatewayConfig, com.google.cloud.iot.v1.GatewayConfig.Builder, @@ -4963,7 +4957,7 @@ public com.google.cloud.iot.v1.GatewayConfigOrBuilder getGatewayConfigOrBuilder( @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-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java index f3b2f97f0de0..b2375b53683b 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java @@ -23,7 +23,6 @@ private DeviceConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) } private DeviceConfig() { - version_ = 0L; binaryData_ = com.google.protobuf.ByteString.EMPTY; } @@ -93,7 +92,7 @@ private DeviceConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -329,19 +328,18 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.iot.v1.DeviceConfig other = (com.google.cloud.iot.v1.DeviceConfig) obj; - boolean result = true; - result = result && (getVersion() == other.getVersion()); - result = result && (hasCloudUpdateTime() == other.hasCloudUpdateTime()); + if (getVersion() != other.getVersion()) return false; + if (hasCloudUpdateTime() != other.hasCloudUpdateTime()) return false; if (hasCloudUpdateTime()) { - result = result && getCloudUpdateTime().equals(other.getCloudUpdateTime()); + if (!getCloudUpdateTime().equals(other.getCloudUpdateTime())) return false; } - result = result && (hasDeviceAckTime() == other.hasDeviceAckTime()); + if (hasDeviceAckTime() != other.hasDeviceAckTime()) return false; if (hasDeviceAckTime()) { - result = result && getDeviceAckTime().equals(other.getDeviceAckTime()); + if (!getDeviceAckTime().equals(other.getDeviceAckTime())) return false; } - result = result && getBinaryData().equals(other.getBinaryData()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getBinaryData().equals(other.getBinaryData())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -567,35 +565,35 @@ public com.google.cloud.iot.v1.DeviceConfig 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 @@ -704,7 +702,7 @@ public Builder clearVersion() { return this; } - private com.google.protobuf.Timestamp cloudUpdateTime_ = null; + private com.google.protobuf.Timestamp cloudUpdateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -894,7 +892,7 @@ public com.google.protobuf.TimestampOrBuilder getCloudUpdateTimeOrBuilder() { return cloudUpdateTimeBuilder_; } - private com.google.protobuf.Timestamp deviceAckTime_ = null; + private com.google.protobuf.Timestamp deviceAckTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1196,7 +1194,7 @@ public Builder clearBinaryData() { @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-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java index 23797367fee0..ec7c49f4c787 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java @@ -82,7 +82,7 @@ private DeviceCredential( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -324,22 +324,20 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.iot.v1.DeviceCredential other = (com.google.cloud.iot.v1.DeviceCredential) obj; - boolean result = true; - result = result && (hasExpirationTime() == other.hasExpirationTime()); + if (hasExpirationTime() != other.hasExpirationTime()) return false; if (hasExpirationTime()) { - result = result && getExpirationTime().equals(other.getExpirationTime()); + if (!getExpirationTime().equals(other.getExpirationTime())) return false; } - result = result && getCredentialCase().equals(other.getCredentialCase()); - if (!result) return false; + if (!getCredentialCase().equals(other.getCredentialCase())) return false; switch (credentialCase_) { case 2: - result = result && getPublicKey().equals(other.getPublicKey()); + if (!getPublicKey().equals(other.getPublicKey())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -560,35 +558,35 @@ public com.google.cloud.iot.v1.DeviceCredential 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 @@ -952,7 +950,7 @@ public com.google.cloud.iot.v1.PublicKeyCredentialOrBuilder getPublicKeyOrBuilde return publicKeyBuilder_; } - private com.google.protobuf.Timestamp expirationTime_ = null; + private com.google.protobuf.Timestamp expirationTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1153,7 +1151,7 @@ public com.google.protobuf.TimestampOrBuilder getExpirationTimeOrBuilder() { @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-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java index ae13fb28b5d7..e4523d7f41a5 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java @@ -101,7 +101,7 @@ private DeviceRegistry( } case 66: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000080) != 0)) { credentials_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000080; @@ -128,7 +128,7 @@ private DeviceRegistry( } case 82: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { eventNotificationConfigs_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; @@ -147,7 +147,7 @@ private DeviceRegistry( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -159,10 +159,10 @@ private DeviceRegistry( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (((mutable_bitField0_ & 0x00000080) != 0)) { credentials_ = java.util.Collections.unmodifiableList(credentials_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { eventNotificationConfigs_ = java.util.Collections.unmodifiableList(eventNotificationConfigs_); } @@ -756,27 +756,26 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.iot.v1.DeviceRegistry other = (com.google.cloud.iot.v1.DeviceRegistry) obj; - boolean result = true; - result = result && getId().equals(other.getId()); - result = result && getName().equals(other.getName()); - result = - result && getEventNotificationConfigsList().equals(other.getEventNotificationConfigsList()); - result = result && (hasStateNotificationConfig() == other.hasStateNotificationConfig()); + if (!getId().equals(other.getId())) return false; + if (!getName().equals(other.getName())) return false; + if (!getEventNotificationConfigsList().equals(other.getEventNotificationConfigsList())) + return false; + if (hasStateNotificationConfig() != other.hasStateNotificationConfig()) return false; if (hasStateNotificationConfig()) { - result = result && getStateNotificationConfig().equals(other.getStateNotificationConfig()); + if (!getStateNotificationConfig().equals(other.getStateNotificationConfig())) return false; } - result = result && (hasMqttConfig() == other.hasMqttConfig()); + if (hasMqttConfig() != other.hasMqttConfig()) return false; if (hasMqttConfig()) { - result = result && getMqttConfig().equals(other.getMqttConfig()); + if (!getMqttConfig().equals(other.getMqttConfig())) return false; } - result = result && (hasHttpConfig() == other.hasHttpConfig()); + if (hasHttpConfig() != other.hasHttpConfig()) return false; if (hasHttpConfig()) { - result = result && getHttpConfig().equals(other.getHttpConfig()); + if (!getHttpConfig().equals(other.getHttpConfig())) return false; } - result = result && logLevel_ == other.logLevel_; - result = result && getCredentialsList().equals(other.getCredentialsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (logLevel_ != other.logLevel_) return false; + if (!getCredentialsList().equals(other.getCredentialsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1028,7 +1027,7 @@ public com.google.cloud.iot.v1.DeviceRegistry buildPartial() { result.id_ = id_; result.name_ = name_; if (eventNotificationConfigsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { eventNotificationConfigs_ = java.util.Collections.unmodifiableList(eventNotificationConfigs_); bitField0_ = (bitField0_ & ~0x00000004); @@ -1054,7 +1053,7 @@ public com.google.cloud.iot.v1.DeviceRegistry buildPartial() { } result.logLevel_ = logLevel_; if (credentialsBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000080) != 0)) { credentials_ = java.util.Collections.unmodifiableList(credentials_); bitField0_ = (bitField0_ & ~0x00000080); } @@ -1069,35 +1068,35 @@ public com.google.cloud.iot.v1.DeviceRegistry 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 @@ -1414,7 +1413,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { eventNotificationConfigs_ = java.util.Collections.emptyList(); private void ensureEventNotificationConfigsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { eventNotificationConfigs_ = new java.util.ArrayList( eventNotificationConfigs_); @@ -1927,7 +1926,7 @@ public Builder removeEventNotificationConfigs(int index) { com.google.cloud.iot.v1.EventNotificationConfig.Builder, com.google.cloud.iot.v1.EventNotificationConfigOrBuilder>( eventNotificationConfigs_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); eventNotificationConfigs_ = null; @@ -1935,7 +1934,7 @@ public Builder removeEventNotificationConfigs(int index) { return eventNotificationConfigsBuilder_; } - private com.google.cloud.iot.v1.StateNotificationConfig stateNotificationConfig_ = null; + private com.google.cloud.iot.v1.StateNotificationConfig stateNotificationConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.StateNotificationConfig, com.google.cloud.iot.v1.StateNotificationConfig.Builder, @@ -2166,7 +2165,7 @@ public Builder clearStateNotificationConfig() { return stateNotificationConfigBuilder_; } - private com.google.cloud.iot.v1.MqttConfig mqttConfig_ = null; + private com.google.cloud.iot.v1.MqttConfig mqttConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.MqttConfig, com.google.cloud.iot.v1.MqttConfig.Builder, @@ -2347,7 +2346,7 @@ public com.google.cloud.iot.v1.MqttConfigOrBuilder getMqttConfigOrBuilder() { return mqttConfigBuilder_; } - private com.google.cloud.iot.v1.HttpConfig httpConfig_ = null; + private com.google.cloud.iot.v1.HttpConfig httpConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.HttpConfig, com.google.cloud.iot.v1.HttpConfig.Builder, @@ -2617,7 +2616,7 @@ public Builder clearLogLevel() { java.util.Collections.emptyList(); private void ensureCredentialsIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000080) != 0)) { credentials_ = new java.util.ArrayList(credentials_); bitField0_ |= 0x00000080; @@ -3120,10 +3119,7 @@ public com.google.cloud.iot.v1.RegistryCredential.Builder addCredentialsBuilder( com.google.cloud.iot.v1.RegistryCredential, com.google.cloud.iot.v1.RegistryCredential.Builder, com.google.cloud.iot.v1.RegistryCredentialOrBuilder>( - credentials_, - ((bitField0_ & 0x00000080) == 0x00000080), - getParentForChildren(), - isClean()); + credentials_, ((bitField0_ & 0x00000080) != 0), getParentForChildren(), isClean()); credentials_ = null; } return credentialsBuilder_; @@ -3131,7 +3127,7 @@ public com.google.cloud.iot.v1.RegistryCredential.Builder addCredentialsBuilder( @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-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java index b87419f51f70..57128e49da5a 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java @@ -72,7 +72,7 @@ private DeviceState( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -211,14 +211,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.iot.v1.DeviceState other = (com.google.cloud.iot.v1.DeviceState) obj; - boolean result = true; - result = result && (hasUpdateTime() == other.hasUpdateTime()); + if (hasUpdateTime() != other.hasUpdateTime()) return false; if (hasUpdateTime()) { - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) return false; } - result = result && getBinaryData().equals(other.getBinaryData()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getBinaryData().equals(other.getBinaryData())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -424,35 +423,35 @@ public com.google.cloud.iot.v1.DeviceState 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 @@ -502,7 +501,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Timestamp updateTime_ = null; + private com.google.protobuf.Timestamp updateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -739,7 +738,7 @@ public Builder clearBinaryData() { @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-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java index 0a56f50b69c6..c34329fdd436 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java @@ -67,7 +67,7 @@ private EventNotificationConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -244,11 +244,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.EventNotificationConfig other = (com.google.cloud.iot.v1.EventNotificationConfig) obj; - boolean result = true; - result = result && getSubfolderMatches().equals(other.getSubfolderMatches()); - result = result && getPubsubTopicName().equals(other.getPubsubTopicName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSubfolderMatches().equals(other.getSubfolderMatches())) return false; + if (!getPubsubTopicName().equals(other.getPubsubTopicName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -446,35 +445,35 @@ public com.google.cloud.iot.v1.EventNotificationConfig 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 @@ -737,7 +736,7 @@ public Builder setPubsubTopicNameBytes(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-iot-v1/src/main/java/com/google/cloud/iot/v1/GatewayConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GatewayConfig.java index a981c979f07a..5517a125b70b 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GatewayConfig.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GatewayConfig.java @@ -90,7 +90,7 @@ private GatewayConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -336,16 +336,15 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.iot.v1.GatewayConfig other = (com.google.cloud.iot.v1.GatewayConfig) obj; - boolean result = true; - result = result && gatewayType_ == other.gatewayType_; - result = result && gatewayAuthMethod_ == other.gatewayAuthMethod_; - result = result && getLastAccessedGatewayId().equals(other.getLastAccessedGatewayId()); - result = result && (hasLastAccessedGatewayTime() == other.hasLastAccessedGatewayTime()); + if (gatewayType_ != other.gatewayType_) return false; + if (gatewayAuthMethod_ != other.gatewayAuthMethod_) return false; + if (!getLastAccessedGatewayId().equals(other.getLastAccessedGatewayId())) return false; + if (hasLastAccessedGatewayTime() != other.hasLastAccessedGatewayTime()) return false; if (hasLastAccessedGatewayTime()) { - result = result && getLastAccessedGatewayTime().equals(other.getLastAccessedGatewayTime()); + if (!getLastAccessedGatewayTime().equals(other.getLastAccessedGatewayTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -562,35 +561,35 @@ public com.google.cloud.iot.v1.GatewayConfig 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 @@ -898,7 +897,7 @@ public Builder setLastAccessedGatewayIdBytes(com.google.protobuf.ByteString valu return this; } - private com.google.protobuf.Timestamp lastAccessedGatewayTime_ = null; + private com.google.protobuf.Timestamp lastAccessedGatewayTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1091,7 +1090,7 @@ public com.google.protobuf.TimestampOrBuilder getLastAccessedGatewayTimeOrBuilde @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-iot-v1/src/main/java/com/google/cloud/iot/v1/GatewayListOptions.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GatewayListOptions.java index 1f1e054d943d..f3e81053c368 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GatewayListOptions.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GatewayListOptions.java @@ -71,7 +71,7 @@ private GatewayListOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -359,24 +359,22 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.GatewayListOptions other = (com.google.cloud.iot.v1.GatewayListOptions) obj; - boolean result = true; - result = result && getFilterCase().equals(other.getFilterCase()); - if (!result) return false; + if (!getFilterCase().equals(other.getFilterCase())) return false; switch (filterCase_) { case 1: - result = result && getGatewayTypeValue() == other.getGatewayTypeValue(); + if (getGatewayTypeValue() != other.getGatewayTypeValue()) return false; break; case 2: - result = result && getAssociationsGatewayId().equals(other.getAssociationsGatewayId()); + if (!getAssociationsGatewayId().equals(other.getAssociationsGatewayId())) return false; break; case 3: - result = result && getAssociationsDeviceId().equals(other.getAssociationsDeviceId()); + if (!getAssociationsDeviceId().equals(other.getAssociationsDeviceId())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -592,35 +590,35 @@ public com.google.cloud.iot.v1.GatewayListOptions 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 @@ -1039,7 +1037,7 @@ public Builder setAssociationsDeviceIdBytes(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-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java index 19d37464d243..dca4c44061f6 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java @@ -59,7 +59,7 @@ private GetDeviceRegistryRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.GetDeviceRegistryRequest other = (com.google.cloud.iot.v1.GetDeviceRegistryRequest) 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 @@ -377,35 +376,35 @@ public com.google.cloud.iot.v1.GetDeviceRegistryRequest 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 @@ -555,7 +554,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-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java index e15221724ff8..8ca2888fae82 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java @@ -74,7 +74,7 @@ private GetDeviceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -245,14 +245,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.iot.v1.GetDeviceRequest other = (com.google.cloud.iot.v1.GetDeviceRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasFieldMask() == other.hasFieldMask()); + if (!getName().equals(other.getName())) return false; + if (hasFieldMask() != other.hasFieldMask()) return false; if (hasFieldMask()) { - result = result && getFieldMask().equals(other.getFieldMask()); + if (!getFieldMask().equals(other.getFieldMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -460,35 +459,35 @@ public com.google.cloud.iot.v1.GetDeviceRequest 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 @@ -643,7 +642,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask fieldMask_ = null; + private com.google.protobuf.FieldMask fieldMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -829,7 +828,7 @@ public com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder() { @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-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java index dd33e92ed463..d02c3fbbb5a2 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java @@ -59,7 +59,7 @@ private HttpConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -167,10 +167,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.iot.v1.HttpConfig other = (com.google.cloud.iot.v1.HttpConfig) obj; - boolean result = true; - result = result && httpEnabledState_ == other.httpEnabledState_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (httpEnabledState_ != other.httpEnabledState_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -361,35 +360,35 @@ public com.google.cloud.iot.v1.HttpConfig 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 @@ -519,7 +518,7 @@ public Builder clearHttpEnabledState() { @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-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java index 35f556dc2dff..b40cef3f80db 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java @@ -25,7 +25,6 @@ private ListDeviceConfigVersionsRequest( private ListDeviceConfigVersionsRequest() { name_ = ""; - numVersions_ = 0; } @java.lang.Override @@ -66,7 +65,7 @@ private ListDeviceConfigVersionsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -213,11 +212,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest other = (com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (getNumVersions() == other.getNumVersions()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (getNumVersions() != other.getNumVersions()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -416,35 +414,35 @@ public com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest 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 @@ -653,7 +651,7 @@ public Builder clearNumVersions() { @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-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java index 7634cdda72fb..e788d5ecbb35 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java @@ -53,7 +53,7 @@ private ListDeviceConfigVersionsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { deviceConfigs_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -64,7 +64,7 @@ private ListDeviceConfigVersionsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -76,7 +76,7 @@ private ListDeviceConfigVersionsResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { deviceConfigs_ = java.util.Collections.unmodifiableList(deviceConfigs_); } this.unknownFields = unknownFields.build(); @@ -213,10 +213,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse other = (com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse) obj; - boolean result = true; - result = result && getDeviceConfigsList().equals(other.getDeviceConfigsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDeviceConfigsList().equals(other.getDeviceConfigsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -413,7 +412,7 @@ public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse buildPartial() { new com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse(this); int from_bitField0_ = bitField0_; if (deviceConfigsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { deviceConfigs_ = java.util.Collections.unmodifiableList(deviceConfigs_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -427,35 +426,35 @@ public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse 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 @@ -534,7 +533,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureDeviceConfigsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { deviceConfigs_ = new java.util.ArrayList(deviceConfigs_); bitField0_ |= 0x00000001; @@ -893,7 +892,7 @@ public com.google.cloud.iot.v1.DeviceConfig.Builder addDeviceConfigsBuilder(int com.google.cloud.iot.v1.DeviceConfig.Builder, com.google.cloud.iot.v1.DeviceConfigOrBuilder>( deviceConfigs_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); deviceConfigs_ = null; @@ -903,7 +902,7 @@ public com.google.cloud.iot.v1.DeviceConfig.Builder addDeviceConfigsBuilder(int @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-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java index 7ef53d7b55d6..e0fd3a285632 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java @@ -24,7 +24,6 @@ private ListDeviceRegistriesRequest(com.google.protobuf.GeneratedMessageV3.Build private ListDeviceRegistriesRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -73,7 +72,7 @@ private ListDeviceRegistriesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -272,12 +271,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.ListDeviceRegistriesRequest other = (com.google.cloud.iot.v1.ListDeviceRegistriesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -480,35 +478,35 @@ public com.google.cloud.iot.v1.ListDeviceRegistriesRequest 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 @@ -823,7 +821,7 @@ public Builder setPageTokenBytes(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-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java index 2447efbc34fc..7d7474b77b17 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java @@ -53,7 +53,7 @@ private ListDeviceRegistriesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { deviceRegistries_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -72,7 +72,7 @@ private ListDeviceRegistriesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListDeviceRegistriesResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { deviceRegistries_ = java.util.Collections.unmodifiableList(deviceRegistries_); } this.unknownFields = unknownFields.build(); @@ -270,11 +270,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.ListDeviceRegistriesResponse other = (com.google.cloud.iot.v1.ListDeviceRegistriesResponse) obj; - boolean result = true; - result = result && getDeviceRegistriesList().equals(other.getDeviceRegistriesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDeviceRegistriesList().equals(other.getDeviceRegistriesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -475,7 +474,7 @@ public com.google.cloud.iot.v1.ListDeviceRegistriesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (deviceRegistriesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { deviceRegistries_ = java.util.Collections.unmodifiableList(deviceRegistries_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -491,35 +490,35 @@ public com.google.cloud.iot.v1.ListDeviceRegistriesResponse 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 @@ -602,7 +601,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureDeviceRegistriesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { deviceRegistries_ = new java.util.ArrayList(deviceRegistries_); bitField0_ |= 0x00000001; @@ -944,7 +943,7 @@ public com.google.cloud.iot.v1.DeviceRegistry.Builder addDeviceRegistriesBuilder com.google.cloud.iot.v1.DeviceRegistry.Builder, com.google.cloud.iot.v1.DeviceRegistryOrBuilder>( deviceRegistries_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); deviceRegistries_ = null; @@ -1058,7 +1057,7 @@ public Builder setNextPageTokenBytes(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-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java index f1498f6f008a..2ef48949bbd6 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java @@ -24,7 +24,6 @@ private ListDeviceStatesRequest(com.google.protobuf.GeneratedMessageV3.Builder(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private ListDeviceStatesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private ListDeviceStatesResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { deviceStates_ = java.util.Collections.unmodifiableList(deviceStates_); } this.unknownFields = unknownFields.build(); @@ -212,10 +212,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.ListDeviceStatesResponse other = (com.google.cloud.iot.v1.ListDeviceStatesResponse) obj; - boolean result = true; - result = result && getDeviceStatesList().equals(other.getDeviceStatesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDeviceStatesList().equals(other.getDeviceStatesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -411,7 +410,7 @@ public com.google.cloud.iot.v1.ListDeviceStatesResponse buildPartial() { new com.google.cloud.iot.v1.ListDeviceStatesResponse(this); int from_bitField0_ = bitField0_; if (deviceStatesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { deviceStates_ = java.util.Collections.unmodifiableList(deviceStates_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -425,35 +424,35 @@ public com.google.cloud.iot.v1.ListDeviceStatesResponse 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 @@ -531,7 +530,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureDeviceStatesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { deviceStates_ = new java.util.ArrayList(deviceStates_); bitField0_ |= 0x00000001; } @@ -888,10 +887,7 @@ public com.google.cloud.iot.v1.DeviceState.Builder addDeviceStatesBuilder(int in com.google.cloud.iot.v1.DeviceState, com.google.cloud.iot.v1.DeviceState.Builder, com.google.cloud.iot.v1.DeviceStateOrBuilder>( - deviceStates_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + deviceStates_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); deviceStates_ = null; } return deviceStatesBuilder_; @@ -899,7 +895,7 @@ public com.google.cloud.iot.v1.DeviceState.Builder addDeviceStatesBuilder(int in @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-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java index 2a86cc8638e2..44de7a90ae9b 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java @@ -24,9 +24,8 @@ private ListDevicesRequest(com.google.protobuf.GeneratedMessageV3.Builder bui private ListDevicesRequest() { parent_ = ""; - deviceNumIds_ = java.util.Collections.emptyList(); + deviceNumIds_ = emptyLongList(); deviceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; - pageSize_ = 0; pageToken_ = ""; } @@ -63,24 +62,23 @@ private ListDevicesRequest( } case 16: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - deviceNumIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + deviceNumIds_ = newLongList(); mutable_bitField0_ |= 0x00000002; } - deviceNumIds_.add(input.readUInt64()); + deviceNumIds_.addLong(input.readUInt64()); break; } case 18: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) - && input.getBytesUntilLimit() > 0) { - deviceNumIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + deviceNumIds_ = newLongList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - deviceNumIds_.add(input.readUInt64()); + deviceNumIds_.addLong(input.readUInt64()); } input.popLimit(limit); break; @@ -88,7 +86,7 @@ private ListDevicesRequest( case 26: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { deviceIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -140,7 +138,7 @@ private ListDevicesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -152,10 +150,10 @@ private ListDevicesRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - deviceNumIds_ = java.util.Collections.unmodifiableList(deviceNumIds_); + if (((mutable_bitField0_ & 0x00000002) != 0)) { + deviceNumIds_.makeImmutable(); // C } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { deviceIds_ = deviceIds_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -225,7 +223,7 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int DEVICE_NUM_IDS_FIELD_NUMBER = 2; - private java.util.List deviceNumIds_; + private com.google.protobuf.Internal.LongList deviceNumIds_; /** * * @@ -263,7 +261,7 @@ public int getDeviceNumIdsCount() { * repeated uint64 device_num_ids = 2; */ public long getDeviceNumIds(int index) { - return deviceNumIds_.get(index); + return deviceNumIds_.getLong(index); } private int deviceNumIdsMemoizedSerializedSize = -1; @@ -497,7 +495,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(deviceNumIdsMemoizedSerializedSize); } for (int i = 0; i < deviceNumIds_.size(); i++) { - output.writeUInt64NoTag(deviceNumIds_.get(i)); + output.writeUInt64NoTag(deviceNumIds_.getLong(i)); } for (int i = 0; i < deviceIds_.size(); i++) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, deviceIds_.getRaw(i)); @@ -530,7 +528,7 @@ public int getSerializedSize() { int dataSize = 0; for (int i = 0; i < deviceNumIds_.size(); i++) { dataSize += - com.google.protobuf.CodedOutputStream.computeUInt64SizeNoTag(deviceNumIds_.get(i)); + com.google.protobuf.CodedOutputStream.computeUInt64SizeNoTag(deviceNumIds_.getLong(i)); } size += dataSize; if (!getDeviceNumIdsList().isEmpty()) { @@ -575,22 +573,21 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.ListDevicesRequest other = (com.google.cloud.iot.v1.ListDevicesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getDeviceNumIdsList().equals(other.getDeviceNumIdsList()); - result = result && getDeviceIdsList().equals(other.getDeviceIdsList()); - result = result && (hasFieldMask() == other.hasFieldMask()); + if (!getParent().equals(other.getParent())) return false; + if (!getDeviceNumIdsList().equals(other.getDeviceNumIdsList())) return false; + if (!getDeviceIdsList().equals(other.getDeviceIdsList())) return false; + if (hasFieldMask() != other.hasFieldMask()) return false; if (hasFieldMask()) { - result = result && getFieldMask().equals(other.getFieldMask()); + if (!getFieldMask().equals(other.getFieldMask())) return false; } - result = result && (hasGatewayListOptions() == other.hasGatewayListOptions()); + if (hasGatewayListOptions() != other.hasGatewayListOptions()) return false; if (hasGatewayListOptions()) { - result = result && getGatewayListOptions().equals(other.getGatewayListOptions()); + if (!getGatewayListOptions().equals(other.getGatewayListOptions())) return false; } - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -769,7 +766,7 @@ public Builder clear() { super.clear(); parent_ = ""; - deviceNumIds_ = java.util.Collections.emptyList(); + deviceNumIds_ = emptyLongList(); bitField0_ = (bitField0_ & ~0x00000002); deviceIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000004); @@ -819,12 +816,12 @@ public com.google.cloud.iot.v1.ListDevicesRequest buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.parent_ = parent_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - deviceNumIds_ = java.util.Collections.unmodifiableList(deviceNumIds_); + if (((bitField0_ & 0x00000002) != 0)) { + deviceNumIds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.deviceNumIds_ = deviceNumIds_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { deviceIds_ = deviceIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000004); } @@ -848,35 +845,35 @@ public com.google.cloud.iot.v1.ListDevicesRequest 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 @@ -1058,11 +1055,11 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private java.util.List deviceNumIds_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.LongList deviceNumIds_ = emptyLongList(); private void ensureDeviceNumIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { - deviceNumIds_ = new java.util.ArrayList(deviceNumIds_); + if (!((bitField0_ & 0x00000002) != 0)) { + deviceNumIds_ = mutableCopy(deviceNumIds_); bitField0_ |= 0x00000002; } } @@ -1077,7 +1074,9 @@ private void ensureDeviceNumIdsIsMutable() { * repeated uint64 device_num_ids = 2; */ public java.util.List getDeviceNumIdsList() { - return java.util.Collections.unmodifiableList(deviceNumIds_); + return ((bitField0_ & 0x00000002) != 0) + ? java.util.Collections.unmodifiableList(deviceNumIds_) + : deviceNumIds_; } /** * @@ -1103,7 +1102,7 @@ public int getDeviceNumIdsCount() { * repeated uint64 device_num_ids = 2; */ public long getDeviceNumIds(int index) { - return deviceNumIds_.get(index); + return deviceNumIds_.getLong(index); } /** * @@ -1117,7 +1116,7 @@ public long getDeviceNumIds(int index) { */ public Builder setDeviceNumIds(int index, long value) { ensureDeviceNumIdsIsMutable(); - deviceNumIds_.set(index, value); + deviceNumIds_.setLong(index, value); onChanged(); return this; } @@ -1133,7 +1132,7 @@ public Builder setDeviceNumIds(int index, long value) { */ public Builder addDeviceNumIds(long value) { ensureDeviceNumIdsIsMutable(); - deviceNumIds_.add(value); + deviceNumIds_.addLong(value); onChanged(); return this; } @@ -1164,7 +1163,7 @@ public Builder addAllDeviceNumIds(java.lang.Iterable v * repeated uint64 device_num_ids = 2; */ public Builder clearDeviceNumIds() { - deviceNumIds_ = java.util.Collections.emptyList(); + deviceNumIds_ = emptyLongList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; @@ -1174,7 +1173,7 @@ public Builder clearDeviceNumIds() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureDeviceIdsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { deviceIds_ = new com.google.protobuf.LazyStringArrayList(deviceIds_); bitField0_ |= 0x00000004; } @@ -1322,7 +1321,7 @@ public Builder addDeviceIdsBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.FieldMask fieldMask_ = null; + private com.google.protobuf.FieldMask fieldMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1515,7 +1514,7 @@ public com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder() { return fieldMaskBuilder_; } - private com.google.cloud.iot.v1.GatewayListOptions gatewayListOptions_ = null; + private com.google.cloud.iot.v1.GatewayListOptions gatewayListOptions_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.GatewayListOptions, com.google.cloud.iot.v1.GatewayListOptions.Builder, @@ -1856,7 +1855,7 @@ public Builder setPageTokenBytes(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-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java index de99c1787bfa..7de06bf4d0cf 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java @@ -53,7 +53,7 @@ private ListDevicesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { devices_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListDevicesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListDevicesResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { devices_ = java.util.Collections.unmodifiableList(devices_); } this.unknownFields = unknownFields.build(); @@ -266,11 +266,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.ListDevicesResponse other = (com.google.cloud.iot.v1.ListDevicesResponse) obj; - boolean result = true; - result = result && getDevicesList().equals(other.getDevicesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDevicesList().equals(other.getDevicesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -471,7 +470,7 @@ public com.google.cloud.iot.v1.ListDevicesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (devicesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { devices_ = java.util.Collections.unmodifiableList(devices_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -487,35 +486,35 @@ public com.google.cloud.iot.v1.ListDevicesResponse 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 @@ -596,7 +595,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureDevicesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { devices_ = new java.util.ArrayList(devices_); bitField0_ |= 0x00000001; } @@ -932,10 +931,7 @@ public java.util.List getDevicesBuilderL com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, com.google.cloud.iot.v1.DeviceOrBuilder>( - devices_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + devices_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); devices_ = null; } return devicesBuilder_; @@ -1042,7 +1038,7 @@ public Builder setNextPageTokenBytes(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-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java index 1c756d00671d..578c5ad15080 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java @@ -25,7 +25,6 @@ private ModifyCloudToDeviceConfigRequest( private ModifyCloudToDeviceConfigRequest() { name_ = ""; - versionToUpdate_ = 0L; binaryData_ = com.google.protobuf.ByteString.EMPTY; } @@ -72,7 +71,7 @@ private ModifyCloudToDeviceConfigRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -242,12 +241,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest other = (com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (getVersionToUpdate() == other.getVersionToUpdate()); - result = result && getBinaryData().equals(other.getBinaryData()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (getVersionToUpdate() != other.getVersionToUpdate()) return false; + if (!getBinaryData().equals(other.getBinaryData())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -451,35 +449,35 @@ public com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest 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 @@ -744,7 +742,7 @@ public Builder clearBinaryData() { @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-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java index ce4672ff4f75..42e8a1363557 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java @@ -59,7 +59,7 @@ private MqttConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -167,10 +167,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.iot.v1.MqttConfig other = (com.google.cloud.iot.v1.MqttConfig) obj; - boolean result = true; - result = result && mqttEnabledState_ == other.mqttEnabledState_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (mqttEnabledState_ != other.mqttEnabledState_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -361,35 +360,35 @@ public com.google.cloud.iot.v1.MqttConfig 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 @@ -519,7 +518,7 @@ public Builder clearMqttEnabledState() { @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-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java index d8db70c9b1a2..6f6e1345bcb5 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java @@ -83,7 +83,7 @@ private PublicKeyCertificate( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -294,15 +294,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.PublicKeyCertificate other = (com.google.cloud.iot.v1.PublicKeyCertificate) obj; - boolean result = true; - result = result && format_ == other.format_; - result = result && getCertificate().equals(other.getCertificate()); - result = result && (hasX509Details() == other.hasX509Details()); + if (format_ != other.format_) return false; + if (!getCertificate().equals(other.getCertificate())) return false; + if (hasX509Details() != other.hasX509Details()) return false; if (hasX509Details()) { - result = result && getX509Details().equals(other.getX509Details()); + if (!getX509Details().equals(other.getX509Details())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -515,35 +514,35 @@ public com.google.cloud.iot.v1.PublicKeyCertificate 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 @@ -769,7 +768,7 @@ public Builder setCertificateBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.iot.v1.X509CertificateDetails x509Details_ = null; + private com.google.cloud.iot.v1.X509CertificateDetails x509Details_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.X509CertificateDetails, com.google.cloud.iot.v1.X509CertificateDetails.Builder, @@ -953,7 +952,7 @@ public com.google.cloud.iot.v1.X509CertificateDetailsOrBuilder getX509DetailsOrB @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-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java index f42d03a05dbc..ac968794c720 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java @@ -67,7 +67,7 @@ private PublicKeyCredential( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -225,11 +225,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.PublicKeyCredential other = (com.google.cloud.iot.v1.PublicKeyCredential) obj; - boolean result = true; - result = result && format_ == other.format_; - result = result && getKey().equals(other.getKey()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (format_ != other.format_) return false; + if (!getKey().equals(other.getKey())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -427,35 +426,35 @@ public com.google.cloud.iot.v1.PublicKeyCredential 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 @@ -678,7 +677,7 @@ public Builder setKeyBytes(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-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java index 7ac1eedce802..8acef979257e 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java @@ -67,7 +67,7 @@ private RegistryCredential( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -227,18 +227,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.RegistryCredential other = (com.google.cloud.iot.v1.RegistryCredential) obj; - boolean result = true; - result = result && getCredentialCase().equals(other.getCredentialCase()); - if (!result) return false; + if (!getCredentialCase().equals(other.getCredentialCase())) return false; switch (credentialCase_) { case 1: - result = result && getPublicKeyCertificate().equals(other.getPublicKeyCertificate()); + if (!getPublicKeyCertificate().equals(other.getPublicKeyCertificate())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +442,35 @@ public com.google.cloud.iot.v1.RegistryCredential 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 @@ -746,7 +744,7 @@ public com.google.cloud.iot.v1.PublicKeyCertificate.Builder getPublicKeyCertific @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-iot-v1/src/main/java/com/google/cloud/iot/v1/SendCommandToDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/SendCommandToDeviceRequest.java index eae449ca197a..e5bc5e21a105 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/SendCommandToDeviceRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/SendCommandToDeviceRequest.java @@ -73,7 +73,7 @@ private SendCommandToDeviceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -275,12 +275,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.SendCommandToDeviceRequest other = (com.google.cloud.iot.v1.SendCommandToDeviceRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getBinaryData().equals(other.getBinaryData()); - result = result && getSubfolder().equals(other.getSubfolder()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getBinaryData().equals(other.getBinaryData())) return false; + if (!getSubfolder().equals(other.getSubfolder())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -483,35 +482,35 @@ public com.google.cloud.iot.v1.SendCommandToDeviceRequest 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 @@ -835,7 +834,7 @@ public Builder setSubfolderBytes(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-iot-v1/src/main/java/com/google/cloud/iot/v1/SendCommandToDeviceResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/SendCommandToDeviceResponse.java index 1aa6fb97e76f..1ccadcb0daef 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/SendCommandToDeviceResponse.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/SendCommandToDeviceResponse.java @@ -49,7 +49,7 @@ private SendCommandToDeviceResponse( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -120,9 +120,8 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.SendCommandToDeviceResponse other = (com.google.cloud.iot.v1.SendCommandToDeviceResponse) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -310,35 +309,35 @@ public com.google.cloud.iot.v1.SendCommandToDeviceResponse 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 @@ -386,7 +385,7 @@ public Builder mergeFrom( @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-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java index d2dd80a20dbb..7cd9be3a2a1f 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java @@ -59,7 +59,7 @@ private StateNotificationConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.StateNotificationConfig other = (com.google.cloud.iot.v1.StateNotificationConfig) obj; - boolean result = true; - result = result && getPubsubTopicName().equals(other.getPubsubTopicName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPubsubTopicName().equals(other.getPubsubTopicName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -377,35 +376,35 @@ public com.google.cloud.iot.v1.StateNotificationConfig 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 @@ -555,7 +554,7 @@ public Builder setPubsubTopicNameBytes(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-iot-v1/src/main/java/com/google/cloud/iot/v1/UnbindDeviceFromGatewayRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UnbindDeviceFromGatewayRequest.java index 78df053316cc..cbea1b5228f4 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UnbindDeviceFromGatewayRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UnbindDeviceFromGatewayRequest.java @@ -76,7 +76,7 @@ private UnbindDeviceFromGatewayRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -302,12 +302,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.UnbindDeviceFromGatewayRequest other = (com.google.cloud.iot.v1.UnbindDeviceFromGatewayRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getGatewayId().equals(other.getGatewayId()); - result = result && getDeviceId().equals(other.getDeviceId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getGatewayId().equals(other.getGatewayId())) return false; + if (!getDeviceId().equals(other.getDeviceId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -511,35 +510,35 @@ public com.google.cloud.iot.v1.UnbindDeviceFromGatewayRequest 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 @@ -901,7 +900,7 @@ public Builder setDeviceIdBytes(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-iot-v1/src/main/java/com/google/cloud/iot/v1/UnbindDeviceFromGatewayResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UnbindDeviceFromGatewayResponse.java index b81e46d9b8b0..6c678b151139 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UnbindDeviceFromGatewayResponse.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UnbindDeviceFromGatewayResponse.java @@ -50,7 +50,7 @@ private UnbindDeviceFromGatewayResponse( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -121,9 +121,8 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.UnbindDeviceFromGatewayResponse other = (com.google.cloud.iot.v1.UnbindDeviceFromGatewayResponse) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -312,35 +311,35 @@ public com.google.cloud.iot.v1.UnbindDeviceFromGatewayResponse 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 @@ -388,7 +387,7 @@ public Builder mergeFrom( @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-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java index 31ba73a100ba..27d750a22541 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java @@ -81,7 +81,7 @@ private UpdateDeviceRegistryRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -262,17 +262,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.UpdateDeviceRegistryRequest other = (com.google.cloud.iot.v1.UpdateDeviceRegistryRequest) obj; - boolean result = true; - result = result && (hasDeviceRegistry() == other.hasDeviceRegistry()); + if (hasDeviceRegistry() != other.hasDeviceRegistry()) return false; if (hasDeviceRegistry()) { - result = result && getDeviceRegistry().equals(other.getDeviceRegistry()); + if (!getDeviceRegistry().equals(other.getDeviceRegistry())) 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 @@ -490,35 +489,35 @@ public com.google.cloud.iot.v1.UpdateDeviceRegistryRequest 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 @@ -570,7 +569,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.iot.v1.DeviceRegistry deviceRegistry_ = null; + private com.google.cloud.iot.v1.DeviceRegistry deviceRegistry_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.DeviceRegistry, com.google.cloud.iot.v1.DeviceRegistry.Builder, @@ -770,7 +769,7 @@ public com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistryOrBuilde return deviceRegistryBuilder_; } - 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, @@ -987,7 +986,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-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java index 6ca9b14af265..25a3ba06f7f6 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java @@ -80,7 +80,7 @@ private UpdateDeviceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -259,17 +259,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.UpdateDeviceRequest other = (com.google.cloud.iot.v1.UpdateDeviceRequest) obj; - boolean result = true; - result = result && (hasDevice() == other.hasDevice()); + if (hasDevice() != other.hasDevice()) return false; if (hasDevice()) { - result = result && getDevice().equals(other.getDevice()); + if (!getDevice().equals(other.getDevice())) 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 @@ -487,35 +486,35 @@ public com.google.cloud.iot.v1.UpdateDeviceRequest 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 @@ -565,7 +564,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.iot.v1.Device device_ = null; + private com.google.cloud.iot.v1.Device device_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.iot.v1.Device, com.google.cloud.iot.v1.Device.Builder, @@ -767,7 +766,7 @@ public com.google.cloud.iot.v1.DeviceOrBuilder getDeviceOrBuilder() { return deviceBuilder_; } - 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, @@ -975,7 +974,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-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java index 0d398ecb422f..6140760cf020 100644 --- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java +++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java @@ -113,7 +113,7 @@ private X509CertificateDetails( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -470,21 +470,20 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.iot.v1.X509CertificateDetails other = (com.google.cloud.iot.v1.X509CertificateDetails) obj; - boolean result = true; - result = result && getIssuer().equals(other.getIssuer()); - result = result && getSubject().equals(other.getSubject()); - result = result && (hasStartTime() == other.hasStartTime()); + if (!getIssuer().equals(other.getIssuer())) return false; + if (!getSubject().equals(other.getSubject())) return false; + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasExpiryTime() == other.hasExpiryTime()); + if (hasExpiryTime() != other.hasExpiryTime()) return false; if (hasExpiryTime()) { - result = result && getExpiryTime().equals(other.getExpiryTime()); + if (!getExpiryTime().equals(other.getExpiryTime())) return false; } - result = result && getSignatureAlgorithm().equals(other.getSignatureAlgorithm()); - result = result && getPublicKeyType().equals(other.getPublicKeyType()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSignatureAlgorithm().equals(other.getSignatureAlgorithm())) return false; + if (!getPublicKeyType().equals(other.getPublicKeyType())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -722,35 +721,35 @@ public com.google.cloud.iot.v1.X509CertificateDetails 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 @@ -1004,7 +1003,7 @@ public Builder setSubjectBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1179,7 +1178,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp expiryTime_ = null; + private com.google.protobuf.Timestamp expiryTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1548,7 +1547,7 @@ public Builder setPublicKeyTypeBytes(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-cloud-clients/google-cloud-iot/synth.metadata b/google-cloud-clients/google-cloud-iot/synth.metadata index 986a9c0455fb..0f08c4bff5f1 100644 --- a/google-cloud-clients/google-cloud-iot/synth.metadata +++ b/google-cloud-clients/google-cloud-iot/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-06T08:45:02.464959Z", + "updateTime": "2019-03-30T07:46:34.639174Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.15", - "dockerImage": "googleapis/artman@sha256:9caadfa59d48224cba5f3217eb9d61a155b78ccf31e628abef385bc5b7ed3bd2" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "856117505ff9075b3e9c0b5674113667b6cf9e00", - "internalRef": "236931378" + "sha": "fd67be4b51a8c809b97100ccf1c3cffd15b85d7b", + "internalRef": "241096997" } } ],