diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ed34c4..ae13380 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.1.13](https://github.com/googleapis/java-optimization/compare/v1.1.12...v1.1.13) (2022-10-05) + + +### Bug Fixes + +* update protobuf to v3.21.7 ([5a869dc](https://github.com/googleapis/java-optimization/commit/5a869dcf51284aa94d6202ef05db5f0c4059e20e)) + ## [1.1.12](https://github.com/googleapis/java-optimization/compare/v1.1.11...v1.1.12) (2022-10-03) diff --git a/README.md b/README.md index da971e0..6c72f98 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-optimization - 1.1.11 + 1.1.12 ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-optimization:1.1.11' +implementation 'com.google.cloud:google-cloud-optimization:1.1.12' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-optimization" % "1.1.11" +libraryDependencies += "com.google.cloud" % "google-cloud-optimization" % "1.1.12" ``` ## Authentication diff --git a/google-cloud-optimization-bom/pom.xml b/google-cloud-optimization-bom/pom.xml index 8675e2f..3aa964d 100644 --- a/google-cloud-optimization-bom/pom.xml +++ b/google-cloud-optimization-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-optimization-bom - 1.1.12 + 1.1.13 pom com.google.cloud @@ -65,17 +65,17 @@ com.google.cloud google-cloud-optimization - 1.1.12 + 1.1.13 com.google.api.grpc grpc-google-cloud-optimization-v1 - 1.1.12 + 1.1.13 com.google.api.grpc proto-google-cloud-optimization-v1 - 1.1.12 + 1.1.13 diff --git a/google-cloud-optimization/pom.xml b/google-cloud-optimization/pom.xml index 5232e15..fdb0419 100644 --- a/google-cloud-optimization/pom.xml +++ b/google-cloud-optimization/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-optimization - 1.1.12 + 1.1.13 jar Google Cloud Fleet Routing https://github.com/googleapis/java-optimization @@ -11,7 +11,7 @@ com.google.cloud google-cloud-optimization-parent - 1.1.12 + 1.1.13 google-cloud-optimization diff --git a/grpc-google-cloud-optimization-v1/pom.xml b/grpc-google-cloud-optimization-v1/pom.xml index 92642f8..a11b891 100644 --- a/grpc-google-cloud-optimization-v1/pom.xml +++ b/grpc-google-cloud-optimization-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-optimization-v1 - 1.1.12 + 1.1.13 grpc-google-cloud-optimization-v1 GRPC library for google-cloud-optimization com.google.cloud google-cloud-optimization-parent - 1.1.12 + 1.1.13 diff --git a/pom.xml b/pom.xml index 6fe4cea..91d717a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-optimization-parent pom - 1.1.12 + 1.1.13 Google Cloud Fleet Routing Parent https://github.com/googleapis/java-optimization @@ -69,17 +69,17 @@ com.google.cloud google-cloud-optimization - 1.1.12 + 1.1.13 com.google.api.grpc grpc-google-cloud-optimization-v1 - 1.1.12 + 1.1.13 com.google.api.grpc proto-google-cloud-optimization-v1 - 1.1.12 + 1.1.13 diff --git a/proto-google-cloud-optimization-v1/pom.xml b/proto-google-cloud-optimization-v1/pom.xml index fd2adf7..809b1c3 100644 --- a/proto-google-cloud-optimization-v1/pom.xml +++ b/proto-google-cloud-optimization-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-optimization-v1 - 1.1.12 + 1.1.13 proto-google-cloud-optimization-v1 Proto library for google-cloud-optimization com.google.cloud google-cloud-optimization-parent - 1.1.12 + 1.1.13 diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/AggregatedMetrics.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/AggregatedMetrics.java index 96cc8e0..7fe7371 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/AggregatedMetrics.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/AggregatedMetrics.java @@ -53,181 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private AggregatedMetrics( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - performedShipmentCount_ = input.readInt32(); - break; - } - case 18: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (travelDuration_ != null) { - subBuilder = travelDuration_.toBuilder(); - } - travelDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(travelDuration_); - travelDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (waitDuration_ != null) { - subBuilder = waitDuration_.toBuilder(); - } - waitDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(waitDuration_); - waitDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (delayDuration_ != null) { - subBuilder = delayDuration_.toBuilder(); - } - delayDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(delayDuration_); - delayDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (breakDuration_ != null) { - subBuilder = breakDuration_.toBuilder(); - } - breakDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(breakDuration_); - breakDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 50: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (visitDuration_ != null) { - subBuilder = visitDuration_.toBuilder(); - } - visitDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(visitDuration_); - visitDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 58: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (totalDuration_ != null) { - subBuilder = totalDuration_.toBuilder(); - } - totalDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(totalDuration_); - totalDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 65: - { - travelDistanceMeters_ = input.readDouble(); - break; - } - case 74: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - maxLoads_ = - com.google.protobuf.MapField.newMapField( - MaxLoadsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry< - java.lang.String, com.google.cloud.optimization.v1.ShipmentRoute.VehicleLoad> - maxLoads__ = - input.readMessage( - MaxLoadsDefaultEntryHolder.defaultEntry.getParserForType(), - extensionRegistry); - maxLoads_.getMutableMap().put(maxLoads__.getKey(), maxLoads__.getValue()); - break; - } - case 82: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - costs_ = - com.google.protobuf.MapField.newMapField(CostsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000002; - } - com.google.protobuf.MapEntry costs__ = - input.readMessage( - CostsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - costs_.getMutableMap().put(costs__.getKey(), costs__.getValue()); - break; - } - case 89: - { - totalCost_ = input.readDouble(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_AggregatedMetrics_descriptor; @@ -894,7 +719,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (java.lang.Double.doubleToRawLongBits(totalCost_) != 0) { output.writeDouble(11, totalCost_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -953,7 +778,7 @@ public int getSerializedSize() { if (java.lang.Double.doubleToRawLongBits(totalCost_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(11, totalCost_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1000,7 +825,7 @@ public boolean equals(final java.lang.Object obj) { if (!internalGetCosts().equals(other.internalGetCosts())) return false; if (java.lang.Double.doubleToLongBits(getTotalCost()) != java.lang.Double.doubleToLongBits(other.getTotalCost())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1055,7 +880,7 @@ public int hashCode() { (53 * hash) + com.google.protobuf.Internal.hashLong( java.lang.Double.doubleToLongBits(getTotalCost())); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1211,17 +1036,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.cloud.optimization.v1.AggregatedMetrics.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1415,7 +1233,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.AggregatedMetrics othe if (other.getTotalCost() != 0D) { setTotalCost(other.getTotalCost()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1430,18 +1248,107 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.AggregatedMetrics parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + performedShipmentCount_ = input.readInt32(); + + break; + } // case 8 + case 18: + { + input.readMessage(getTravelDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage(getWaitDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + input.readMessage(getDelayDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + input.readMessage(getBreakDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + case 50: + { + input.readMessage(getVisitDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 50 + case 58: + { + input.readMessage(getTotalDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 58 + case 65: + { + travelDistanceMeters_ = input.readDouble(); + + break; + } // case 65 + case 74: + { + com.google.protobuf.MapEntry< + java.lang.String, + com.google.cloud.optimization.v1.ShipmentRoute.VehicleLoad> + maxLoads__ = + input.readMessage( + MaxLoadsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableMaxLoads() + .getMutableMap() + .put(maxLoads__.getKey(), maxLoads__.getValue()); + break; + } // case 74 + case 82: + { + com.google.protobuf.MapEntry costs__ = + input.readMessage( + CostsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + internalGetMutableCosts().getMutableMap().put(costs__.getKey(), costs__.getValue()); + break; + } // case 82 + case 89: + { + totalCost_ = input.readDouble(); + + break; + } // case 89 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.AggregatedMetrics) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3164,7 +3071,18 @@ public AggregatedMetrics parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AggregatedMetrics(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/AsyncModelMetadata.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/AsyncModelMetadata.java index 13b4f3a..b701b5c 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/AsyncModelMetadata.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/AsyncModelMetadata.java @@ -53,89 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private AsyncModelMetadata( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - state_ = rawValue; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - stateMessage_ = s; - break; - } - case 26: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (createTime_ != null) { - subBuilder = createTime_.toBuilder(); - } - createTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(createTime_); - createTime_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (updateTime_ != null) { - subBuilder = updateTime_.toBuilder(); - } - updateTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(updateTime_); - updateTime_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.AsyncModelProto .internal_static_google_cloud_optimization_v1_AsyncModelMetadata_descriptor; @@ -563,7 +480,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (updateTime_ != null) { output.writeMessage(4, getUpdateTime()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -586,7 +503,7 @@ public int getSerializedSize() { if (updateTime_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getUpdateTime()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -612,7 +529,7 @@ public boolean equals(final java.lang.Object obj) { if (hasUpdateTime()) { if (!getUpdateTime().equals(other.getUpdateTime())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -635,7 +552,7 @@ public int hashCode() { hash = (37 * hash) + UPDATE_TIME_FIELD_NUMBER; hash = (53 * hash) + getUpdateTime().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -764,17 +681,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.AsyncModelMetadata.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -898,7 +808,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.AsyncModelMetadata oth if (other.hasUpdateTime()) { mergeUpdateTime(other.getUpdateTime()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -913,18 +823,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.AsyncModelMetadata parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + state_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + stateMessage_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 26: + { + input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.AsyncModelMetadata) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1530,7 +1477,18 @@ public AsyncModelMetadata parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AsyncModelMetadata(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BatchOptimizeToursRequest.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BatchOptimizeToursRequest.java index 24cf698..727d5d9 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BatchOptimizeToursRequest.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BatchOptimizeToursRequest.java @@ -57,72 +57,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BatchOptimizeToursRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - parent_ = s; - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - modelConfigs_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.BatchOptimizeToursRequest - .AsyncModelConfig>(); - mutable_bitField0_ |= 0x00000001; - } - modelConfigs_.add( - input.readMessage( - com.google.cloud.optimization.v1.BatchOptimizeToursRequest.AsyncModelConfig - .parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - modelConfigs_ = java.util.Collections.unmodifiableList(modelConfigs_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_BatchOptimizeToursRequest_descriptor; @@ -306,89 +240,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private AsyncModelConfig( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - displayName_ = s; - break; - } - case 18: - { - com.google.cloud.optimization.v1.InputConfig.Builder subBuilder = null; - if (inputConfig_ != null) { - subBuilder = inputConfig_.toBuilder(); - } - inputConfig_ = - input.readMessage( - com.google.cloud.optimization.v1.InputConfig.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(inputConfig_); - inputConfig_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.cloud.optimization.v1.OutputConfig.Builder subBuilder = null; - if (outputConfig_ != null) { - subBuilder = outputConfig_.toBuilder(); - } - outputConfig_ = - input.readMessage( - com.google.cloud.optimization.v1.OutputConfig.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(outputConfig_); - outputConfig_ = subBuilder.buildPartial(); - } - - break; - } - case 32: - { - enableCheckpoints_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_BatchOptimizeToursRequest_AsyncModelConfig_descriptor; @@ -615,7 +466,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (enableCheckpoints_ != false) { output.writeBool(4, enableCheckpoints_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -636,7 +487,7 @@ public int getSerializedSize() { if (enableCheckpoints_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(4, enableCheckpoints_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -663,7 +514,7 @@ public boolean equals(final java.lang.Object obj) { if (!getOutputConfig().equals(other.getOutputConfig())) return false; } if (getEnableCheckpoints() != other.getEnableCheckpoints()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -686,7 +537,7 @@ public int hashCode() { } hash = (37 * hash) + ENABLE_CHECKPOINTS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getEnableCheckpoints()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -826,17 +677,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.cloud.optimization.v1.BatchOptimizeToursRequest.AsyncModelConfig.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -971,7 +815,7 @@ public Builder mergeFrom( if (other.getEnableCheckpoints() != false) { setEnableCheckpoints(other.getEnableCheckpoints()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -986,20 +830,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.BatchOptimizeToursRequest.AsyncModelConfig parsedMessage = - null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + displayName_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + input.readMessage(getInputConfigFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage(getOutputConfigFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 32: + { + enableCheckpoints_ = input.readBool(); + + break; + } // case 32 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.BatchOptimizeToursRequest.AsyncModelConfig) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1631,7 +1510,19 @@ public AsyncModelConfig parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new AsyncModelConfig(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1815,7 +1706,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < modelConfigs_.size(); i++) { output.writeMessage(2, modelConfigs_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1830,7 +1721,7 @@ public int getSerializedSize() { for (int i = 0; i < modelConfigs_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, modelConfigs_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1848,7 +1739,7 @@ public boolean equals(final java.lang.Object obj) { if (!getParent().equals(other.getParent())) return false; if (!getModelConfigsList().equals(other.getModelConfigsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1865,7 +1756,7 @@ public int hashCode() { hash = (37 * hash) + MODEL_CONFIGS_FIELD_NUMBER; hash = (53 * hash) + getModelConfigsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1999,19 +1890,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.BatchOptimizeToursRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getModelConfigsFieldBuilder(); - } } @java.lang.Override @@ -2021,10 +1903,11 @@ public Builder clear() { if (modelConfigsBuilder_ == null) { modelConfigs_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + modelConfigs_ = null; modelConfigsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -2144,7 +2027,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.BatchOptimizeToursRequ } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2159,18 +2042,52 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.BatchOptimizeToursRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + parent_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + com.google.cloud.optimization.v1.BatchOptimizeToursRequest.AsyncModelConfig m = + input.readMessage( + com.google.cloud.optimization.v1.BatchOptimizeToursRequest.AsyncModelConfig + .parser(), + extensionRegistry); + if (modelConfigsBuilder_ == null) { + ensureModelConfigsIsMutable(); + modelConfigs_.add(m); + } else { + modelConfigsBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.BatchOptimizeToursRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2762,7 +2679,18 @@ public BatchOptimizeToursRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BatchOptimizeToursRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BatchOptimizeToursResponse.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BatchOptimizeToursResponse.java index daccb80..47b4494 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BatchOptimizeToursResponse.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BatchOptimizeToursResponse.java @@ -51,45 +51,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BatchOptimizeToursResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_BatchOptimizeToursResponse_descriptor; @@ -119,7 +80,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -128,7 +89,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -144,7 +105,7 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.optimization.v1.BatchOptimizeToursResponse other = (com.google.cloud.optimization.v1.BatchOptimizeToursResponse) obj; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -155,7 +116,7 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -286,17 +247,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.BatchOptimizeToursResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -379,7 +333,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.cloud.optimization.v1.BatchOptimizeToursResponse other) { if (other == com.google.cloud.optimization.v1.BatchOptimizeToursResponse.getDefaultInstance()) return this; - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -394,18 +348,31 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.BatchOptimizeToursResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.BatchOptimizeToursResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -441,7 +408,18 @@ public BatchOptimizeToursResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BatchOptimizeToursResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BreakRule.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BreakRule.java index e0d9899..97df41d 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BreakRule.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/BreakRule.java @@ -61,80 +61,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BreakRule( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - breakRequests_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.BreakRule.BreakRequest>(); - mutable_bitField0_ |= 0x00000001; - } - breakRequests_.add( - input.readMessage( - com.google.cloud.optimization.v1.BreakRule.BreakRequest.parser(), - extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - frequencyConstraints_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.BreakRule.FrequencyConstraint>(); - mutable_bitField0_ |= 0x00000002; - } - frequencyConstraints_.add( - input.readMessage( - com.google.cloud.optimization.v1.BreakRule.FrequencyConstraint.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - breakRequests_ = java.util.Collections.unmodifiableList(breakRequests_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - frequencyConstraints_ = java.util.Collections.unmodifiableList(frequencyConstraints_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_BreakRule_descriptor; @@ -311,90 +237,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BreakRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (earliestStartTime_ != null) { - subBuilder = earliestStartTime_.toBuilder(); - } - earliestStartTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(earliestStartTime_); - earliestStartTime_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (latestStartTime_ != null) { - subBuilder = latestStartTime_.toBuilder(); - } - latestStartTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(latestStartTime_); - latestStartTime_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (minDuration_ != null) { - subBuilder = minDuration_.toBuilder(); - } - minDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(minDuration_); - minDuration_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_BreakRule_BreakRequest_descriptor; @@ -592,7 +434,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (minDuration_ != null) { output.writeMessage(3, getMinDuration()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -610,7 +452,7 @@ public int getSerializedSize() { if (minDuration_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getMinDuration()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -638,7 +480,7 @@ public boolean equals(final java.lang.Object obj) { if (hasMinDuration()) { if (!getMinDuration().equals(other.getMinDuration())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -661,7 +503,7 @@ public int hashCode() { hash = (37 * hash) + MIN_DURATION_FIELD_NUMBER; hash = (53 * hash) + getMinDuration().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -797,17 +639,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.BreakRule.BreakRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -934,7 +769,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.BreakRule.BreakRequest if (other.hasMinDuration()) { mergeMinDuration(other.getMinDuration()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -949,18 +784,51 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.BreakRule.BreakRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage( + getEarliestStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage( + getLatestStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage(getMinDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.BreakRule.BreakRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1597,7 +1465,19 @@ public BreakRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BreakRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1774,75 +1654,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FrequencyConstraint( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (minBreakDuration_ != null) { - subBuilder = minBreakDuration_.toBuilder(); - } - minBreakDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(minBreakDuration_); - minBreakDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (maxInterBreakDuration_ != null) { - subBuilder = maxInterBreakDuration_.toBuilder(); - } - maxInterBreakDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(maxInterBreakDuration_); - maxInterBreakDuration_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_BreakRule_FrequencyConstraint_descriptor; @@ -1995,7 +1806,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (maxInterBreakDuration_ != null) { output.writeMessage(2, getMaxInterBreakDuration()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2011,7 +1822,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getMaxInterBreakDuration()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2035,7 +1846,7 @@ public boolean equals(final java.lang.Object obj) { if (hasMaxInterBreakDuration()) { if (!getMaxInterBreakDuration().equals(other.getMaxInterBreakDuration())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2054,7 +1865,7 @@ public int hashCode() { hash = (37 * hash) + MAX_INTER_BREAK_DURATION_FIELD_NUMBER; hash = (53 * hash) + getMaxInterBreakDuration().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2216,17 +2027,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.BreakRule.FrequencyConstraint.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -2342,7 +2146,7 @@ public Builder mergeFrom( if (other.hasMaxInterBreakDuration()) { mergeMaxInterBreakDuration(other.getMaxInterBreakDuration()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2357,19 +2161,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.BreakRule.FrequencyConstraint parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage( + getMinBreakDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage( + getMaxInterBreakDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.BreakRule.FrequencyConstraint) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2842,7 +2672,19 @@ public FrequencyConstraint parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FrequencyConstraint(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -3042,7 +2884,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < frequencyConstraints_.size(); i++) { output.writeMessage(2, frequencyConstraints_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3058,7 +2900,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, frequencyConstraints_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3076,7 +2918,7 @@ public boolean equals(final java.lang.Object obj) { if (!getBreakRequestsList().equals(other.getBreakRequestsList())) return false; if (!getFrequencyConstraintsList().equals(other.getFrequencyConstraintsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3095,7 +2937,7 @@ public int hashCode() { hash = (37 * hash) + FREQUENCY_CONSTRAINTS_FIELD_NUMBER; hash = (53 * hash) + getFrequencyConstraintsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3232,20 +3074,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.BreakRule.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getBreakRequestsFieldBuilder(); - getFrequencyConstraintsFieldBuilder(); - } } @java.lang.Override @@ -3253,16 +3085,18 @@ public Builder clear() { super.clear(); if (breakRequestsBuilder_ == null) { breakRequests_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + breakRequests_ = null; breakRequestsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (frequencyConstraintsBuilder_ == null) { frequencyConstraints_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + frequencyConstraints_ = null; frequencyConstraintsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -3412,7 +3246,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.BreakRule other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3427,17 +3261,59 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.BreakRule parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.cloud.optimization.v1.BreakRule.BreakRequest m = + input.readMessage( + com.google.cloud.optimization.v1.BreakRule.BreakRequest.parser(), + extensionRegistry); + if (breakRequestsBuilder_ == null) { + ensureBreakRequestsIsMutable(); + breakRequests_.add(m); + } else { + breakRequestsBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.cloud.optimization.v1.BreakRule.FrequencyConstraint m = + input.readMessage( + com.google.cloud.optimization.v1.BreakRule.FrequencyConstraint.parser(), + extensionRegistry); + if (frequencyConstraintsBuilder_ == null) { + ensureFrequencyConstraintsIsMutable(); + frequencyConstraints_.add(m); + } else { + frequencyConstraintsBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.BreakRule) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4285,7 +4161,18 @@ public BreakRule parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BreakRule(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/CapacityQuantity.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/CapacityQuantity.java index 767c00b..8893e9d 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/CapacityQuantity.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/CapacityQuantity.java @@ -53,57 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CapacityQuantity( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - type_ = s; - break; - } - case 16: - { - value_ = input.readInt64(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_CapacityQuantity_descriptor; @@ -188,7 +137,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (value_ != 0L) { output.writeInt64(2, value_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -203,7 +152,7 @@ public int getSerializedSize() { if (value_ != 0L) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, value_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -221,7 +170,7 @@ public boolean equals(final java.lang.Object obj) { if (!getType().equals(other.getType())) return false; if (getValue() != other.getValue()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -236,7 +185,7 @@ public int hashCode() { hash = (53 * hash) + getType().hashCode(); hash = (37 * hash) + VALUE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getValue()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -365,17 +314,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.CapacityQuantity.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -471,7 +413,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.CapacityQuantity other if (other.getValue() != 0L) { setValue(other.getValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -486,18 +428,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.CapacityQuantity parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + type_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 16: + { + value_ = input.readInt64(); + + break; + } // case 16 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.CapacityQuantity) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -643,7 +610,18 @@ public CapacityQuantity parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CapacityQuantity(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/CapacityQuantityInterval.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/CapacityQuantityInterval.java index 22a8864..dcab0da 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/CapacityQuantityInterval.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/CapacityQuantityInterval.java @@ -53,65 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private CapacityQuantityInterval( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - type_ = s; - break; - } - case 16: - { - bitField0_ |= 0x00000001; - minValue_ = input.readInt64(); - break; - } - case 24: - { - bitField0_ |= 0x00000002; - maxValue_ = input.readInt64(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_CapacityQuantityInterval_descriptor; @@ -230,7 +171,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000002) != 0)) { output.writeInt64(3, maxValue_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -248,7 +189,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(3, maxValue_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -273,7 +214,7 @@ public boolean equals(final java.lang.Object obj) { if (hasMaxValue()) { if (getMaxValue() != other.getMaxValue()) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -294,7 +235,7 @@ public int hashCode() { hash = (37 * hash) + MAX_VALUE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getMaxValue()); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -424,17 +365,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.CapacityQuantityInterval.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -545,7 +479,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.CapacityQuantityInterv if (other.hasMaxValue()) { setMaxValue(other.getMaxValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -560,18 +494,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.CapacityQuantityInterval parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + type_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 16: + { + minValue_ = input.readInt64(); + bitField0_ |= 0x00000001; + break; + } // case 16 + case 24: + { + maxValue_ = input.readInt64(); + bitField0_ |= 0x00000002; + break; + } // case 24 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.CapacityQuantityInterval) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -771,7 +736,18 @@ public CapacityQuantityInterval parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new CapacityQuantityInterval(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/DistanceLimit.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/DistanceLimit.java index caf4e6f..87bf684 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/DistanceLimit.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/DistanceLimit.java @@ -53,64 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DistanceLimit( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - bitField0_ |= 0x00000001; - maxMeters_ = input.readInt64(); - break; - } - case 16: - { - bitField0_ |= 0x00000002; - softMaxMeters_ = input.readInt64(); - break; - } - case 25: - { - bitField0_ |= 0x00000004; - costPerKilometerAboveSoftMax_ = input.readDouble(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_DistanceLimit_descriptor; @@ -273,7 +215,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000004) != 0)) { output.writeDouble(3, costPerKilometerAboveSoftMax_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -292,7 +234,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(3, costPerKilometerAboveSoftMax_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -322,7 +264,7 @@ public boolean equals(final java.lang.Object obj) { != java.lang.Double.doubleToLongBits(other.getCostPerKilometerAboveSoftMax())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -348,7 +290,7 @@ public int hashCode() { + com.google.protobuf.Internal.hashLong( java.lang.Double.doubleToLongBits(getCostPerKilometerAboveSoftMax())); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -480,17 +422,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.DistanceLimit.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -602,7 +537,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.DistanceLimit other) { if (other.hasCostPerKilometerAboveSoftMax()) { setCostPerKilometerAboveSoftMax(other.getCostPerKilometerAboveSoftMax()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -617,17 +552,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.DistanceLimit parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + maxMeters_ = input.readInt64(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 16: + { + softMaxMeters_ = input.readInt64(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 25: + { + costPerKilometerAboveSoftMax_ = input.readDouble(); + bitField0_ |= 0x00000004; + break; + } // case 25 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.DistanceLimit) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -914,7 +881,18 @@ public DistanceLimit parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DistanceLimit(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/GcsDestination.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/GcsDestination.java index 57877ec..253174a 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/GcsDestination.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/GcsDestination.java @@ -52,52 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private GcsDestination( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - uri_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.AsyncModelProto .internal_static_google_cloud_optimization_v1_GcsDestination_descriptor; @@ -179,7 +133,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, uri_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -191,7 +145,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, uri_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -208,7 +162,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.cloud.optimization.v1.GcsDestination) obj; if (!getUri().equals(other.getUri())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -221,7 +175,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + URI_FIELD_NUMBER; hash = (53 * hash) + getUri().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -350,17 +304,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.GcsDestination.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -450,7 +397,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.GcsDestination other) uri_ = other.uri_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -465,17 +412,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.GcsDestination parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + uri_ = input.readStringRequireUtf8(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.GcsDestination) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -617,7 +584,18 @@ public GcsDestination parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GcsDestination(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/GcsSource.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/GcsSource.java index dfcc8f1..f622be8 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/GcsSource.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/GcsSource.java @@ -52,52 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private GcsSource( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - uri_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.AsyncModelProto .internal_static_google_cloud_optimization_v1_GcsSource_descriptor; @@ -179,7 +133,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, uri_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -191,7 +145,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(uri_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, uri_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -208,7 +162,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.cloud.optimization.v1.GcsSource) obj; if (!getUri().equals(other.getUri())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -221,7 +175,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + URI_FIELD_NUMBER; hash = (53 * hash) + getUri().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -350,17 +304,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.GcsSource.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -449,7 +396,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.GcsSource other) { uri_ = other.uri_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -464,17 +411,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.GcsSource parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + uri_ = input.readStringRequireUtf8(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.GcsSource) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -616,7 +583,18 @@ public GcsSource parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GcsSource(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/InjectedSolutionConstraint.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/InjectedSolutionConstraint.java index 0b9f636..1924aba 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/InjectedSolutionConstraint.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/InjectedSolutionConstraint.java @@ -55,95 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private InjectedSolutionConstraint( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - routes_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - routes_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.parser(), extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - skippedShipments_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - skippedShipments_.add( - input.readMessage( - com.google.cloud.optimization.v1.SkippedShipment.parser(), - extensionRegistry)); - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - constraintRelaxations_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.InjectedSolutionConstraint - .ConstraintRelaxation>(); - mutable_bitField0_ |= 0x00000004; - } - constraintRelaxations_.add( - input.readMessage( - com.google.cloud.optimization.v1.InjectedSolutionConstraint - .ConstraintRelaxation.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - routes_ = java.util.Collections.unmodifiableList(routes_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - skippedShipments_ = java.util.Collections.unmodifiableList(skippedShipments_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - constraintRelaxations_ = java.util.Collections.unmodifiableList(constraintRelaxations_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_InjectedSolutionConstraint_descriptor; @@ -344,91 +255,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ConstraintRelaxation( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - relaxations_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.InjectedSolutionConstraint - .ConstraintRelaxation.Relaxation>(); - mutable_bitField0_ |= 0x00000001; - } - relaxations_.add( - input.readMessage( - com.google.cloud.optimization.v1.InjectedSolutionConstraint - .ConstraintRelaxation.Relaxation.parser(), - extensionRegistry)); - break; - } - case 16: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - vehicleIndices_ = newIntList(); - mutable_bitField0_ |= 0x00000002; - } - vehicleIndices_.addInt(input.readInt32()); - break; - } - case 18: - { - int length = input.readRawVarint32(); - int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - vehicleIndices_ = newIntList(); - mutable_bitField0_ |= 0x00000002; - } - while (input.getBytesUntilLimit() > 0) { - vehicleIndices_.addInt(input.readInt32()); - } - input.popLimit(limit); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - relaxations_ = java.util.Collections.unmodifiableList(relaxations_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - vehicleIndices_.makeImmutable(); // C - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_InjectedSolutionConstraint_ConstraintRelaxation_descriptor; @@ -602,73 +428,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Relaxation( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - level_ = rawValue; - break; - } - case 18: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (thresholdTime_ != null) { - subBuilder = thresholdTime_.toBuilder(); - } - thresholdTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(thresholdTime_); - thresholdTime_ = subBuilder.buildPartial(); - } - - break; - } - case 24: - { - thresholdVisitCount_ = input.readInt32(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_InjectedSolutionConstraint_ConstraintRelaxation_Relaxation_descriptor; @@ -1038,7 +797,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (thresholdVisitCount_ != 0) { output.writeInt32(3, thresholdVisitCount_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1059,7 +818,7 @@ public int getSerializedSize() { if (thresholdVisitCount_ != 0) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(3, thresholdVisitCount_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1087,7 +846,7 @@ public boolean equals(final java.lang.Object obj) { if (!getThresholdTime().equals(other.getThresholdTime())) return false; } if (getThresholdVisitCount() != other.getThresholdVisitCount()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1106,7 +865,7 @@ public int hashCode() { } hash = (37 * hash) + THRESHOLD_VISIT_COUNT_FIELD_NUMBER; hash = (53 * hash) + getThresholdVisitCount(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1293,17 +1052,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.cloud.optimization.v1.InjectedSolutionConstraint.ConstraintRelaxation.Relaxation.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1436,7 +1188,7 @@ public Builder mergeFrom( if (other.getThresholdVisitCount() != 0) { setThresholdVisitCount(other.getThresholdVisitCount()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1451,22 +1203,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.InjectedSolutionConstraint.ConstraintRelaxation - .Relaxation - parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + level_ = input.readEnum(); + + break; + } // case 8 + case 18: + { + input.readMessage( + getThresholdTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 24: + { + thresholdVisitCount_ = input.readInt32(); + + break; + } // case 24 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.InjectedSolutionConstraint.ConstraintRelaxation - .Relaxation) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1883,7 +1663,19 @@ public Relaxation parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Relaxation(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2102,7 +1894,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < vehicleIndices_.size(); i++) { output.writeInt32NoTag(vehicleIndices_.getInt(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2128,7 +1920,7 @@ public int getSerializedSize() { } vehicleIndicesMemoizedSerializedSize = dataSize; } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2148,7 +1940,7 @@ public boolean equals(final java.lang.Object obj) { if (!getRelaxationsList().equals(other.getRelaxationsList())) return false; if (!getVehicleIndicesList().equals(other.getVehicleIndicesList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2167,7 +1959,7 @@ public int hashCode() { hash = (37 * hash) + VEHICLE_INDICES_FIELD_NUMBER; hash = (53 * hash) + getVehicleIndicesList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2313,19 +2105,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.cloud.optimization.v1.InjectedSolutionConstraint.ConstraintRelaxation.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getRelaxationsFieldBuilder(); - } } @java.lang.Override @@ -2333,10 +2116,11 @@ public Builder clear() { super.clear(); if (relaxationsBuilder_ == null) { relaxations_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + relaxations_ = null; relaxationsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); vehicleIndices_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); return this; @@ -2482,7 +2266,7 @@ public Builder mergeFrom( } onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2497,20 +2281,66 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.InjectedSolutionConstraint.ConstraintRelaxation - parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.cloud.optimization.v1.InjectedSolutionConstraint.ConstraintRelaxation + .Relaxation + m = + input.readMessage( + com.google.cloud.optimization.v1.InjectedSolutionConstraint + .ConstraintRelaxation.Relaxation.parser(), + extensionRegistry); + if (relaxationsBuilder_ == null) { + ensureRelaxationsIsMutable(); + relaxations_.add(m); + } else { + relaxationsBuilder_.addMessage(m); + } + break; + } // case 10 + case 16: + { + int v = input.readInt32(); + ensureVehicleIndicesIsMutable(); + vehicleIndices_.addInt(v); + break; + } // case 16 + case 18: + { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + ensureVehicleIndicesIsMutable(); + while (input.getBytesUntilLimit() > 0) { + vehicleIndices_.addInt(input.readInt32()); + } + input.popLimit(limit); + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.InjectedSolutionConstraint.ConstraintRelaxation) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3209,7 +3039,19 @@ public ConstraintRelaxation parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ConstraintRelaxation(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -3505,7 +3347,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < constraintRelaxations_.size(); i++) { output.writeMessage(3, constraintRelaxations_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3525,7 +3367,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 3, constraintRelaxations_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3544,7 +3386,7 @@ public boolean equals(final java.lang.Object obj) { if (!getRoutesList().equals(other.getRoutesList())) return false; if (!getSkippedShipmentsList().equals(other.getSkippedShipmentsList())) return false; if (!getConstraintRelaxationsList().equals(other.getConstraintRelaxationsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3567,7 +3409,7 @@ public int hashCode() { hash = (37 * hash) + CONSTRAINT_RELAXATIONS_FIELD_NUMBER; hash = (53 * hash) + getConstraintRelaxationsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3698,21 +3540,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.InjectedSolutionConstraint.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getRoutesFieldBuilder(); - getSkippedShipmentsFieldBuilder(); - getConstraintRelaxationsFieldBuilder(); - } } @java.lang.Override @@ -3720,22 +3551,25 @@ public Builder clear() { super.clear(); if (routesBuilder_ == null) { routes_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + routes_ = null; routesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (skippedShipmentsBuilder_ == null) { skippedShipments_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + skippedShipments_ = null; skippedShipmentsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (constraintRelaxationsBuilder_ == null) { constraintRelaxations_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + constraintRelaxations_ = null; constraintRelaxationsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -3922,7 +3756,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.InjectedSolutionConstr } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3937,18 +3771,73 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.InjectedSolutionConstraint parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.cloud.optimization.v1.ShipmentRoute m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentRoute.parser(), extensionRegistry); + if (routesBuilder_ == null) { + ensureRoutesIsMutable(); + routes_.add(m); + } else { + routesBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.cloud.optimization.v1.SkippedShipment m = + input.readMessage( + com.google.cloud.optimization.v1.SkippedShipment.parser(), + extensionRegistry); + if (skippedShipmentsBuilder_ == null) { + ensureSkippedShipmentsIsMutable(); + skippedShipments_.add(m); + } else { + skippedShipmentsBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.cloud.optimization.v1.InjectedSolutionConstraint.ConstraintRelaxation m = + input.readMessage( + com.google.cloud.optimization.v1.InjectedSolutionConstraint + .ConstraintRelaxation.parser(), + extensionRegistry); + if (constraintRelaxationsBuilder_ == null) { + ensureConstraintRelaxationsIsMutable(); + constraintRelaxations_.add(m); + } else { + constraintRelaxationsBuilder_.addMessage(m); + } + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.InjectedSolutionConstraint) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -5217,7 +5106,18 @@ public InjectedSolutionConstraint parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new InjectedSolutionConstraint(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/InputConfig.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/InputConfig.java index 62935f8..5efe9e6 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/InputConfig.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/InputConfig.java @@ -52,68 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private InputConfig( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.cloud.optimization.v1.GcsSource.Builder subBuilder = null; - if (sourceCase_ == 1) { - subBuilder = ((com.google.cloud.optimization.v1.GcsSource) source_).toBuilder(); - } - source_ = - input.readMessage( - com.google.cloud.optimization.v1.GcsSource.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.cloud.optimization.v1.GcsSource) source_); - source_ = subBuilder.buildPartial(); - } - sourceCase_ = 1; - break; - } - case 16: - { - int rawValue = input.readEnum(); - - dataFormat_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.AsyncModelProto .internal_static_google_cloud_optimization_v1_InputConfig_descriptor; @@ -284,7 +222,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io != com.google.cloud.optimization.v1.DataFormat.DATA_FORMAT_UNSPECIFIED.getNumber()) { output.writeEnum(2, dataFormat_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -302,7 +240,7 @@ public int getSerializedSize() { != com.google.cloud.optimization.v1.DataFormat.DATA_FORMAT_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, dataFormat_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -327,7 +265,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -348,7 +286,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -477,22 +415,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.InputConfig.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override public Builder clear() { super.clear(); + if (gcsSourceBuilder_ != null) { + gcsSourceBuilder_.clear(); + } dataFormat_ = 0; sourceCase_ = 0; @@ -596,7 +530,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.InputConfig other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -611,17 +545,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.InputConfig parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getGcsSourceFieldBuilder().getBuilder(), extensionRegistry); + sourceCase_ = 1; + break; + } // case 10 + case 16: + { + dataFormat_ = input.readEnum(); + + break; + } // case 16 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.InputConfig) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -981,7 +941,18 @@ public InputConfig parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new InputConfig(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Location.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Location.java index f806630..45c384c 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Location.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Location.java @@ -50,66 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Location( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.type.LatLng.Builder subBuilder = null; - if (latLng_ != null) { - subBuilder = latLng_.toBuilder(); - } - latLng_ = input.readMessage(com.google.type.LatLng.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(latLng_); - latLng_ = subBuilder.buildPartial(); - } - - break; - } - case 16: - { - bitField0_ |= 0x00000001; - heading_ = input.readInt32(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_Location_descriptor; @@ -231,7 +171,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000001) != 0)) { output.writeInt32(2, heading_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -246,7 +186,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, heading_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -270,7 +210,7 @@ public boolean equals(final java.lang.Object obj) { if (hasHeading()) { if (getHeading() != other.getHeading()) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -289,7 +229,7 @@ public int hashCode() { hash = (37 * hash) + HEADING_FIELD_NUMBER; hash = (53 * hash) + getHeading(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -418,17 +358,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.Location.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -536,7 +469,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.Location other) { if (other.hasHeading()) { setHeading(other.getHeading()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -551,17 +484,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.Location parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getLatLngFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 16: + { + heading_ = input.readInt32(); + bitField0_ |= 0x00000001; + break; + } // case 16 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.Location) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -851,7 +810,18 @@ public Location parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Location(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursRequest.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursRequest.java index a94061f..7f382a9 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursRequest.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursRequest.java @@ -58,200 +58,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private OptimizeToursRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - parent_ = s; - break; - } - case 18: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (timeout_ != null) { - subBuilder = timeout_.toBuilder(); - } - timeout_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(timeout_); - timeout_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.cloud.optimization.v1.ShipmentModel.Builder subBuilder = null; - if (model_ != null) { - subBuilder = model_.toBuilder(); - } - model_ = - input.readMessage( - com.google.cloud.optimization.v1.ShipmentModel.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(model_); - model_ = subBuilder.buildPartial(); - } - - break; - } - case 32: - { - int rawValue = input.readEnum(); - - solvingMode_ = rawValue; - break; - } - case 40: - { - bitField0_ |= 0x00000001; - maxValidationErrors_ = input.readInt32(); - break; - } - case 48: - { - int rawValue = input.readEnum(); - - searchMode_ = rawValue; - break; - } - case 58: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - injectedFirstSolutionRoutes_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - injectedFirstSolutionRoutes_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.parser(), extensionRegistry)); - break; - } - case 66: - { - com.google.cloud.optimization.v1.InjectedSolutionConstraint.Builder subBuilder = null; - if (injectedSolutionConstraint_ != null) { - subBuilder = injectedSolutionConstraint_.toBuilder(); - } - injectedSolutionConstraint_ = - input.readMessage( - com.google.cloud.optimization.v1.InjectedSolutionConstraint.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(injectedSolutionConstraint_); - injectedSolutionConstraint_ = subBuilder.buildPartial(); - } - - break; - } - case 74: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - refreshDetailsRoutes_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - refreshDetailsRoutes_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.parser(), extensionRegistry)); - break; - } - case 80: - { - interpretInjectedSolutionsUsingLabels_ = input.readBool(); - break; - } - case 88: - { - considerRoadTraffic_ = input.readBool(); - break; - } - case 96: - { - populatePolylines_ = input.readBool(); - break; - } - case 104: - { - populateTransitionPolylines_ = input.readBool(); - break; - } - case 112: - { - allowLargeDeadlineDespiteInterruptionRisk_ = input.readBool(); - break; - } - case 120: - { - useGeodesicDistances_ = input.readBool(); - break; - } - case 129: - { - bitField0_ |= 0x00000002; - geodesicMetersPerSecond_ = input.readDouble(); - break; - } - case 138: - { - java.lang.String s = input.readStringRequireUtf8(); - - label_ = s; - break; - } - case 160: - { - populateTravelStepPolylines_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { - injectedFirstSolutionRoutes_ = - java.util.Collections.unmodifiableList(injectedFirstSolutionRoutes_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - refreshDetailsRoutes_ = java.util.Collections.unmodifiableList(refreshDetailsRoutes_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_OptimizeToursRequest_descriptor; @@ -1623,7 +1429,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (populateTravelStepPolylines_ != false) { output.writeBool(20, populateTravelStepPolylines_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1701,7 +1507,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeBoolSize(20, populateTravelStepPolylines_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1755,7 +1561,7 @@ public boolean equals(final java.lang.Object obj) { } if (!getLabel().equals(other.getLabel())) return false; if (getPopulateTravelStepPolylines() != other.getPopulateTravelStepPolylines()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1824,7 +1630,7 @@ public int hashCode() { hash = (53 * hash) + getLabel().hashCode(); hash = (37 * hash) + POPULATE_TRAVEL_STEP_POLYLINES_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getPopulateTravelStepPolylines()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1955,20 +1761,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.OptimizeToursRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getInjectedFirstSolutionRoutesFieldBuilder(); - getRefreshDetailsRoutesFieldBuilder(); - } } @java.lang.Override @@ -1996,10 +1792,11 @@ public Builder clear() { if (injectedFirstSolutionRoutesBuilder_ == null) { injectedFirstSolutionRoutes_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + injectedFirstSolutionRoutes_ = null; injectedFirstSolutionRoutesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (injectedSolutionConstraintBuilder_ == null) { injectedSolutionConstraint_ = null; } else { @@ -2008,10 +1805,11 @@ public Builder clear() { } if (refreshDetailsRoutesBuilder_ == null) { refreshDetailsRoutes_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + refreshDetailsRoutes_ = null; refreshDetailsRoutesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); interpretInjectedSolutionsUsingLabels_ = false; considerRoadTraffic_ = false; @@ -2269,7 +2067,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.OptimizeToursRequest o if (other.getPopulateTravelStepPolylines() != false) { setPopulateTravelStepPolylines(other.getPopulateTravelStepPolylines()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2284,18 +2082,154 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.OptimizeToursRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + parent_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + input.readMessage(getTimeoutFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage(getModelFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 32: + { + solvingMode_ = input.readEnum(); + + break; + } // case 32 + case 40: + { + maxValidationErrors_ = input.readInt32(); + bitField0_ |= 0x00000001; + break; + } // case 40 + case 48: + { + searchMode_ = input.readEnum(); + + break; + } // case 48 + case 58: + { + com.google.cloud.optimization.v1.ShipmentRoute m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentRoute.parser(), extensionRegistry); + if (injectedFirstSolutionRoutesBuilder_ == null) { + ensureInjectedFirstSolutionRoutesIsMutable(); + injectedFirstSolutionRoutes_.add(m); + } else { + injectedFirstSolutionRoutesBuilder_.addMessage(m); + } + break; + } // case 58 + case 66: + { + input.readMessage( + getInjectedSolutionConstraintFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 66 + case 74: + { + com.google.cloud.optimization.v1.ShipmentRoute m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentRoute.parser(), extensionRegistry); + if (refreshDetailsRoutesBuilder_ == null) { + ensureRefreshDetailsRoutesIsMutable(); + refreshDetailsRoutes_.add(m); + } else { + refreshDetailsRoutesBuilder_.addMessage(m); + } + break; + } // case 74 + case 80: + { + interpretInjectedSolutionsUsingLabels_ = input.readBool(); + + break; + } // case 80 + case 88: + { + considerRoadTraffic_ = input.readBool(); + + break; + } // case 88 + case 96: + { + populatePolylines_ = input.readBool(); + + break; + } // case 96 + case 104: + { + populateTransitionPolylines_ = input.readBool(); + + break; + } // case 104 + case 112: + { + allowLargeDeadlineDespiteInterruptionRisk_ = input.readBool(); + + break; + } // case 112 + case 120: + { + useGeodesicDistances_ = input.readBool(); + + break; + } // case 120 + case 129: + { + geodesicMetersPerSecond_ = input.readDouble(); + bitField0_ |= 0x00000008; + break; + } // case 129 + case 138: + { + label_ = input.readStringRequireUtf8(); + + break; + } // case 138 + case 160: + { + populateTravelStepPolylines_ = input.readBool(); + + break; + } // case 160 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.OptimizeToursRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -5500,7 +5434,18 @@ public OptimizeToursRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new OptimizeToursRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursResponse.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursResponse.java index a648f44..55399a4 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursResponse.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursResponse.java @@ -57,123 +57,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private OptimizeToursResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - routes_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - routes_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.parser(), extensionRegistry)); - break; - } - case 17: - { - totalCost_ = input.readDouble(); - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - requestLabel_ = s; - break; - } - case 34: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - skippedShipments_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - skippedShipments_.add( - input.readMessage( - com.google.cloud.optimization.v1.SkippedShipment.parser(), - extensionRegistry)); - break; - } - case 42: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - validationErrors_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.OptimizeToursValidationError>(); - mutable_bitField0_ |= 0x00000004; - } - validationErrors_.add( - input.readMessage( - com.google.cloud.optimization.v1.OptimizeToursValidationError.parser(), - extensionRegistry)); - break; - } - case 50: - { - com.google.cloud.optimization.v1.OptimizeToursResponse.Metrics.Builder subBuilder = - null; - if (metrics_ != null) { - subBuilder = metrics_.toBuilder(); - } - metrics_ = - input.readMessage( - com.google.cloud.optimization.v1.OptimizeToursResponse.Metrics.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metrics_); - metrics_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - routes_ = java.util.Collections.unmodifiableList(routes_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - skippedShipments_ = java.util.Collections.unmodifiableList(skippedShipments_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - validationErrors_ = java.util.Collections.unmodifiableList(validationErrors_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_OptimizeToursResponse_descriptor; @@ -476,122 +359,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Metrics( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.cloud.optimization.v1.AggregatedMetrics.Builder subBuilder = null; - if (aggregatedRouteMetrics_ != null) { - subBuilder = aggregatedRouteMetrics_.toBuilder(); - } - aggregatedRouteMetrics_ = - input.readMessage( - com.google.cloud.optimization.v1.AggregatedMetrics.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(aggregatedRouteMetrics_); - aggregatedRouteMetrics_ = subBuilder.buildPartial(); - } - - break; - } - case 16: - { - skippedMandatoryShipmentCount_ = input.readInt32(); - break; - } - case 24: - { - usedVehicleCount_ = input.readInt32(); - break; - } - case 34: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (earliestVehicleStartTime_ != null) { - subBuilder = earliestVehicleStartTime_.toBuilder(); - } - earliestVehicleStartTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(earliestVehicleStartTime_); - earliestVehicleStartTime_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (latestVehicleEndTime_ != null) { - subBuilder = latestVehicleEndTime_.toBuilder(); - } - latestVehicleEndTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(latestVehicleEndTime_); - latestVehicleEndTime_ = subBuilder.buildPartial(); - } - - break; - } - case 49: - { - totalCost_ = input.readDouble(); - break; - } - case 82: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - costs_ = - com.google.protobuf.MapField.newMapField( - CostsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry costs__ = - input.readMessage( - CostsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - costs_.getMutableMap().put(costs__.getKey(), costs__.getValue()); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_OptimizeToursResponse_Metrics_descriptor; @@ -992,7 +759,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetCosts(), CostsDefaultEntryHolder.defaultEntry, 10); - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1036,7 +803,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, costs__); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1071,7 +838,7 @@ public boolean equals(final java.lang.Object obj) { if (!internalGetCosts().equals(other.internalGetCosts())) return false; if (java.lang.Double.doubleToLongBits(getTotalCost()) != java.lang.Double.doubleToLongBits(other.getTotalCost())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1107,7 +874,7 @@ public int hashCode() { (53 * hash) + com.google.protobuf.Internal.hashLong( java.lang.Double.doubleToLongBits(getTotalCost())); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1259,17 +1026,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.cloud.optimization.v1.OptimizeToursResponse.Metrics.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1422,7 +1182,7 @@ public Builder mergeFrom( if (other.getTotalCost() != 0D) { setTotalCost(other.getTotalCost()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1437,19 +1197,81 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.OptimizeToursResponse.Metrics parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage( + getAggregatedRouteMetricsFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 16: + { + skippedMandatoryShipmentCount_ = input.readInt32(); + + break; + } // case 16 + case 24: + { + usedVehicleCount_ = input.readInt32(); + + break; + } // case 24 + case 34: + { + input.readMessage( + getEarliestVehicleStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + input.readMessage( + getLatestVehicleEndTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + case 49: + { + totalCost_ = input.readDouble(); + + break; + } // case 49 + case 82: + { + com.google.protobuf.MapEntry costs__ = + input.readMessage( + CostsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableCosts() + .getMutableMap() + .put(costs__.getKey(), costs__.getValue()); + break; + } // case 82 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.OptimizeToursResponse.Metrics) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2452,7 +2274,19 @@ public Metrics parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Metrics(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2867,7 +2701,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (metrics_ != null) { output.writeMessage(6, getMetrics()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2894,7 +2728,7 @@ public int getSerializedSize() { if (metrics_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getMetrics()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2920,7 +2754,7 @@ public boolean equals(final java.lang.Object obj) { } if (java.lang.Double.doubleToLongBits(getTotalCost()) != java.lang.Double.doubleToLongBits(other.getTotalCost())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2954,7 +2788,7 @@ public int hashCode() { (53 * hash) + com.google.protobuf.Internal.hashLong( java.lang.Double.doubleToLongBits(getTotalCost())); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3086,21 +2920,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.OptimizeToursResponse.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getRoutesFieldBuilder(); - getSkippedShipmentsFieldBuilder(); - getValidationErrorsFieldBuilder(); - } } @java.lang.Override @@ -3108,24 +2931,27 @@ public Builder clear() { super.clear(); if (routesBuilder_ == null) { routes_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + routes_ = null; routesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); requestLabel_ = ""; if (skippedShipmentsBuilder_ == null) { skippedShipments_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + skippedShipments_ = null; skippedShipmentsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (validationErrorsBuilder_ == null) { validationErrors_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + validationErrors_ = null; validationErrorsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (metricsBuilder_ == null) { metrics_ = null; } else { @@ -3337,7 +3163,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.OptimizeToursResponse if (other.getTotalCost() != 0D) { setTotalCost(other.getTotalCost()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3352,18 +3178,90 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.OptimizeToursResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.cloud.optimization.v1.ShipmentRoute m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentRoute.parser(), extensionRegistry); + if (routesBuilder_ == null) { + ensureRoutesIsMutable(); + routes_.add(m); + } else { + routesBuilder_.addMessage(m); + } + break; + } // case 10 + case 17: + { + totalCost_ = input.readDouble(); + + break; + } // case 17 + case 26: + { + requestLabel_ = input.readStringRequireUtf8(); + + break; + } // case 26 + case 34: + { + com.google.cloud.optimization.v1.SkippedShipment m = + input.readMessage( + com.google.cloud.optimization.v1.SkippedShipment.parser(), + extensionRegistry); + if (skippedShipmentsBuilder_ == null) { + ensureSkippedShipmentsIsMutable(); + skippedShipments_.add(m); + } else { + skippedShipmentsBuilder_.addMessage(m); + } + break; + } // case 34 + case 42: + { + com.google.cloud.optimization.v1.OptimizeToursValidationError m = + input.readMessage( + com.google.cloud.optimization.v1.OptimizeToursValidationError.parser(), + extensionRegistry); + if (validationErrorsBuilder_ == null) { + ensureValidationErrorsIsMutable(); + validationErrors_.add(m); + } else { + validationErrorsBuilder_.addMessage(m); + } + break; + } // case 42 + case 50: + { + input.readMessage(getMetricsFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 50 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.OptimizeToursResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4944,7 +4842,18 @@ public OptimizeToursResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new OptimizeToursResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursValidationError.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursValidationError.java index 8ec5b32..421ca10 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursValidationError.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OptimizeToursValidationError.java @@ -55,91 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private OptimizeToursValidationError( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - code_ = input.readInt32(); - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - displayName_ = s; - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - fields_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.OptimizeToursValidationError - .FieldReference>(); - mutable_bitField0_ |= 0x00000001; - } - fields_.add( - input.readMessage( - com.google.cloud.optimization.v1.OptimizeToursValidationError.FieldReference - .parser(), - extensionRegistry)); - break; - } - case 34: - { - java.lang.String s = input.readStringRequireUtf8(); - - errorMessage_ = s; - break; - } - case 42: - { - java.lang.String s = input.readStringRequireUtf8(); - - offendingValues_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - fields_ = java.util.Collections.unmodifiableList(fields_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_OptimizeToursValidationError_descriptor; @@ -335,84 +250,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FieldReference( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 16: - { - indexOrKey_ = input.readInt32(); - indexOrKeyCase_ = 2; - break; - } - case 26: - { - com.google.cloud.optimization.v1.OptimizeToursValidationError.FieldReference.Builder - subBuilder = null; - if (subField_ != null) { - subBuilder = subField_.toBuilder(); - } - subField_ = - input.readMessage( - com.google.cloud.optimization.v1.OptimizeToursValidationError.FieldReference - .parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(subField_); - subField_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - java.lang.String s = input.readStringRequireUtf8(); - indexOrKeyCase_ = 4; - indexOrKey_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_OptimizeToursValidationError_FieldReference_descriptor; @@ -713,7 +550,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (indexOrKeyCase_ == 4) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, indexOrKey_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -736,7 +573,7 @@ public int getSerializedSize() { if (indexOrKeyCase_ == 4) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, indexOrKey_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -770,7 +607,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -799,7 +636,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -948,17 +785,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.cloud.optimization.v1.OptimizeToursValidationError.FieldReference.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1100,7 +930,7 @@ public Builder mergeFrom( break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1115,20 +945,56 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.OptimizeToursValidationError.FieldReference parsedMessage = - null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + name_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 16: + { + indexOrKey_ = input.readInt32(); + indexOrKeyCase_ = 2; + break; + } // case 16 + case 26: + { + input.readMessage(getSubFieldFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + java.lang.String s = input.readStringRequireUtf8(); + indexOrKeyCase_ = 4; + indexOrKey_ = s; + break; + } // case 34 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.OptimizeToursValidationError.FieldReference) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1707,7 +1573,19 @@ public FieldReference parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FieldReference(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2280,7 +2158,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(offendingValues_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, offendingValues_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2304,7 +2182,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(offendingValues_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, offendingValues_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2325,7 +2203,7 @@ public boolean equals(final java.lang.Object obj) { if (!getFieldsList().equals(other.getFieldsList())) return false; if (!getErrorMessage().equals(other.getErrorMessage())) return false; if (!getOffendingValues().equals(other.getOffendingValues())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2348,7 +2226,7 @@ public int hashCode() { hash = (53 * hash) + getErrorMessage().hashCode(); hash = (37 * hash) + OFFENDING_VALUES_FIELD_NUMBER; hash = (53 * hash) + getOffendingValues().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2478,19 +2356,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.OptimizeToursValidationError.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getFieldsFieldBuilder(); - } } @java.lang.Override @@ -2502,10 +2371,11 @@ public Builder clear() { if (fieldsBuilder_ == null) { fields_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + fields_ = null; fieldsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); errorMessage_ = ""; offendingValues_ = ""; @@ -2645,7 +2515,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.OptimizeToursValidatio offendingValues_ = other.offendingValues_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2660,19 +2530,70 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.OptimizeToursValidationError parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + code_ = input.readInt32(); + + break; + } // case 8 + case 18: + { + displayName_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 26: + { + com.google.cloud.optimization.v1.OptimizeToursValidationError.FieldReference m = + input.readMessage( + com.google.cloud.optimization.v1.OptimizeToursValidationError.FieldReference + .parser(), + extensionRegistry); + if (fieldsBuilder_ == null) { + ensureFieldsIsMutable(); + fields_.add(m); + } else { + fieldsBuilder_.addMessage(m); + } + break; + } // case 26 + case 34: + { + errorMessage_ = input.readStringRequireUtf8(); + + break; + } // case 34 + case 42: + { + offendingValues_ = input.readStringRequireUtf8(); + + break; + } // case 42 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.OptimizeToursValidationError) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4336,7 +4257,18 @@ public OptimizeToursValidationError parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new OptimizeToursValidationError(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OutputConfig.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OutputConfig.java index 5e9d5c9..6bb8b34 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OutputConfig.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/OutputConfig.java @@ -52,70 +52,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private OutputConfig( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.cloud.optimization.v1.GcsDestination.Builder subBuilder = null; - if (destinationCase_ == 1) { - subBuilder = - ((com.google.cloud.optimization.v1.GcsDestination) destination_).toBuilder(); - } - destination_ = - input.readMessage( - com.google.cloud.optimization.v1.GcsDestination.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom( - (com.google.cloud.optimization.v1.GcsDestination) destination_); - destination_ = subBuilder.buildPartial(); - } - destinationCase_ = 1; - break; - } - case 16: - { - int rawValue = input.readEnum(); - - dataFormat_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.AsyncModelProto .internal_static_google_cloud_optimization_v1_OutputConfig_descriptor; @@ -283,7 +219,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io != com.google.cloud.optimization.v1.DataFormat.DATA_FORMAT_UNSPECIFIED.getNumber()) { output.writeEnum(2, dataFormat_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -301,7 +237,7 @@ public int getSerializedSize() { != com.google.cloud.optimization.v1.DataFormat.DATA_FORMAT_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, dataFormat_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -326,7 +262,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -347,7 +283,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -476,22 +412,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.OutputConfig.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override public Builder clear() { super.clear(); + if (gcsDestinationBuilder_ != null) { + gcsDestinationBuilder_.clear(); + } dataFormat_ = 0; destinationCase_ = 0; @@ -595,7 +527,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.OutputConfig other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -610,17 +542,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.OutputConfig parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getGcsDestinationFieldBuilder().getBuilder(), extensionRegistry); + destinationCase_ = 1; + break; + } // case 10 + case 16: + { + dataFormat_ = input.readEnum(); + + break; + } // case 16 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.OutputConfig) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -972,7 +930,18 @@ public OutputConfig parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new OutputConfig(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Shipment.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Shipment.java index 82a189c..1876115 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Shipment.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Shipment.java @@ -63,252 +63,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Shipment( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - pickups_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.Shipment.VisitRequest>(); - mutable_bitField0_ |= 0x00000001; - } - pickups_.add( - input.readMessage( - com.google.cloud.optimization.v1.Shipment.VisitRequest.parser(), - extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - deliveries_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.Shipment.VisitRequest>(); - mutable_bitField0_ |= 0x00000002; - } - deliveries_.add( - input.readMessage( - com.google.cloud.optimization.v1.Shipment.VisitRequest.parser(), - extensionRegistry)); - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000100) != 0)) { - demands_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000100; - } - demands_.add( - input.readMessage( - com.google.cloud.optimization.v1.CapacityQuantity.parser(), - extensionRegistry)); - break; - } - case 33: - { - bitField0_ |= 0x00000001; - penaltyCost_ = input.readDouble(); - break; - } - case 40: - { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - allowedVehicleIndices_ = newIntList(); - mutable_bitField0_ |= 0x00000010; - } - allowedVehicleIndices_.addInt(input.readInt32()); - break; - } - case 42: - { - int length = input.readRawVarint32(); - int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) { - allowedVehicleIndices_ = newIntList(); - mutable_bitField0_ |= 0x00000010; - } - while (input.getBytesUntilLimit() > 0) { - allowedVehicleIndices_.addInt(input.readInt32()); - } - input.popLimit(limit); - break; - } - case 49: - { - if (!((mutable_bitField0_ & 0x00000020) != 0)) { - costsPerVehicle_ = newDoubleList(); - mutable_bitField0_ |= 0x00000020; - } - costsPerVehicle_.addDouble(input.readDouble()); - break; - } - case 50: - { - int length = input.readRawVarint32(); - int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000020) != 0) && input.getBytesUntilLimit() > 0) { - costsPerVehicle_ = newDoubleList(); - mutable_bitField0_ |= 0x00000020; - } - while (input.getBytesUntilLimit() > 0) { - costsPerVehicle_.addDouble(input.readDouble()); - } - input.popLimit(limit); - break; - } - case 56: - { - if (!((mutable_bitField0_ & 0x00000040) != 0)) { - costsPerVehicleIndices_ = newIntList(); - mutable_bitField0_ |= 0x00000040; - } - costsPerVehicleIndices_.addInt(input.readInt32()); - break; - } - case 58: - { - int length = input.readRawVarint32(); - int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) { - costsPerVehicleIndices_ = newIntList(); - mutable_bitField0_ |= 0x00000040; - } - while (input.getBytesUntilLimit() > 0) { - costsPerVehicleIndices_.addInt(input.readInt32()); - } - input.popLimit(limit); - break; - } - case 65: - { - bitField0_ |= 0x00000002; - pickupToDeliveryRelativeDetourLimit_ = input.readDouble(); - break; - } - case 74: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (pickupToDeliveryAbsoluteDetourLimit_ != null) { - subBuilder = pickupToDeliveryAbsoluteDetourLimit_.toBuilder(); - } - pickupToDeliveryAbsoluteDetourLimit_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(pickupToDeliveryAbsoluteDetourLimit_); - pickupToDeliveryAbsoluteDetourLimit_ = subBuilder.buildPartial(); - } - - break; - } - case 82: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (pickupToDeliveryTimeLimit_ != null) { - subBuilder = pickupToDeliveryTimeLimit_.toBuilder(); - } - pickupToDeliveryTimeLimit_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(pickupToDeliveryTimeLimit_); - pickupToDeliveryTimeLimit_ = subBuilder.buildPartial(); - } - - break; - } - case 90: - { - java.lang.String s = input.readStringRequireUtf8(); - - shipmentType_ = s; - break; - } - case 98: - { - java.lang.String s = input.readStringRequireUtf8(); - - label_ = s; - break; - } - case 104: - { - ignore_ = input.readBool(); - break; - } - case 114: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - loadDemands_ = - com.google.protobuf.MapField.newMapField( - LoadDemandsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000004; - } - com.google.protobuf.MapEntry< - java.lang.String, com.google.cloud.optimization.v1.Shipment.Load> - loadDemands__ = - input.readMessage( - LoadDemandsDefaultEntryHolder.defaultEntry.getParserForType(), - extensionRegistry); - loadDemands_.getMutableMap().put(loadDemands__.getKey(), loadDemands__.getValue()); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - pickups_ = java.util.Collections.unmodifiableList(pickups_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - deliveries_ = java.util.Collections.unmodifiableList(deliveries_); - } - if (((mutable_bitField0_ & 0x00000100) != 0)) { - demands_ = java.util.Collections.unmodifiableList(demands_); - } - if (((mutable_bitField0_ & 0x00000010) != 0)) { - allowedVehicleIndices_.makeImmutable(); // C - } - if (((mutable_bitField0_ & 0x00000020) != 0)) { - costsPerVehicle_.makeImmutable(); // C - } - if (((mutable_bitField0_ & 0x00000040) != 0)) { - costsPerVehicleIndices_.makeImmutable(); // C - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_Shipment_descriptor; @@ -1008,209 +762,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private VisitRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.type.LatLng.Builder subBuilder = null; - if (arrivalLocation_ != null) { - subBuilder = arrivalLocation_.toBuilder(); - } - arrivalLocation_ = - input.readMessage(com.google.type.LatLng.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(arrivalLocation_); - arrivalLocation_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.cloud.optimization.v1.Waypoint.Builder subBuilder = null; - if (arrivalWaypoint_ != null) { - subBuilder = arrivalWaypoint_.toBuilder(); - } - arrivalWaypoint_ = - input.readMessage( - com.google.cloud.optimization.v1.Waypoint.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(arrivalWaypoint_); - arrivalWaypoint_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.type.LatLng.Builder subBuilder = null; - if (departureLocation_ != null) { - subBuilder = departureLocation_.toBuilder(); - } - departureLocation_ = - input.readMessage(com.google.type.LatLng.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(departureLocation_); - departureLocation_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - com.google.cloud.optimization.v1.Waypoint.Builder subBuilder = null; - if (departureWaypoint_ != null) { - subBuilder = departureWaypoint_.toBuilder(); - } - departureWaypoint_ = - input.readMessage( - com.google.cloud.optimization.v1.Waypoint.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(departureWaypoint_); - departureWaypoint_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - tags_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - tags_.add(s); - break; - } - case 50: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - timeWindows_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - timeWindows_.add( - input.readMessage( - com.google.cloud.optimization.v1.TimeWindow.parser(), extensionRegistry)); - break; - } - case 58: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (duration_ != null) { - subBuilder = duration_.toBuilder(); - } - duration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(duration_); - duration_ = subBuilder.buildPartial(); - } - - break; - } - case 65: - { - cost_ = input.readDouble(); - break; - } - case 74: - { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - demands_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - demands_.add( - input.readMessage( - com.google.cloud.optimization.v1.CapacityQuantity.parser(), - extensionRegistry)); - break; - } - case 82: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - visitTypes_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000008; - } - visitTypes_.add(s); - break; - } - case 90: - { - java.lang.String s = input.readStringRequireUtf8(); - - label_ = s; - break; - } - case 98: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - loadDemands_ = - com.google.protobuf.MapField.newMapField( - LoadDemandsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000004; - } - com.google.protobuf.MapEntry< - java.lang.String, com.google.cloud.optimization.v1.Shipment.Load> - loadDemands__ = - input.readMessage( - LoadDemandsDefaultEntryHolder.defaultEntry.getParserForType(), - extensionRegistry); - loadDemands_.getMutableMap().put(loadDemands__.getKey(), loadDemands__.getValue()); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - tags_ = tags_.getUnmodifiableView(); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - timeWindows_ = java.util.Collections.unmodifiableList(timeWindows_); - } - if (((mutable_bitField0_ & 0x00000010) != 0)) { - demands_ = java.util.Collections.unmodifiableList(demands_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - visitTypes_ = visitTypes_.getUnmodifiableView(); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_Shipment_VisitRequest_descriptor; @@ -2107,7 +1658,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetLoadDemands(), LoadDemandsDefaultEntryHolder.defaultEntry, 12); - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2171,7 +1722,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, loadDemands__); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2215,7 +1766,7 @@ public boolean equals(final java.lang.Object obj) { if (!getVisitTypesList().equals(other.getVisitTypesList())) return false; if (!getLabel().equals(other.getLabel())) return false; if (!getDemandsList().equals(other.getDemandsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2272,7 +1823,7 @@ public int hashCode() { hash = (37 * hash) + DEMANDS_FIELD_NUMBER; hash = (53 * hash) + getDemandsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2427,20 +1978,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.cloud.optimization.v1.Shipment.VisitRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getTimeWindowsFieldBuilder(); - getDemandsFieldBuilder(); - } } @java.lang.Override @@ -2474,10 +2015,11 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000001); if (timeWindowsBuilder_ == null) { timeWindows_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + timeWindows_ = null; timeWindowsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (durationBuilder_ == null) { duration_ = null; } else { @@ -2493,10 +2035,11 @@ public Builder clear() { if (demandsBuilder_ == null) { demands_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); } else { + demands_ = null; demandsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000010); return this; } @@ -2731,7 +2274,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.Shipment.VisitRequest } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2746,18 +2289,131 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.Shipment.VisitRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage( + getArrivalLocationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage( + getArrivalWaypointFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage( + getDepartureLocationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + input.readMessage( + getDepartureWaypointFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureTagsIsMutable(); + tags_.add(s); + break; + } // case 42 + case 50: + { + com.google.cloud.optimization.v1.TimeWindow m = + input.readMessage( + com.google.cloud.optimization.v1.TimeWindow.parser(), extensionRegistry); + if (timeWindowsBuilder_ == null) { + ensureTimeWindowsIsMutable(); + timeWindows_.add(m); + } else { + timeWindowsBuilder_.addMessage(m); + } + break; + } // case 50 + case 58: + { + input.readMessage(getDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 58 + case 65: + { + cost_ = input.readDouble(); + + break; + } // case 65 + case 74: + { + com.google.cloud.optimization.v1.CapacityQuantity m = + input.readMessage( + com.google.cloud.optimization.v1.CapacityQuantity.parser(), + extensionRegistry); + if (demandsBuilder_ == null) { + ensureDemandsIsMutable(); + demands_.add(m); + } else { + demandsBuilder_.addMessage(m); + } + break; + } // case 74 + case 82: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureVisitTypesIsMutable(); + visitTypes_.add(s); + break; + } // case 82 + case 90: + { + label_ = input.readStringRequireUtf8(); + + break; + } // case 90 + case 98: + { + com.google.protobuf.MapEntry< + java.lang.String, com.google.cloud.optimization.v1.Shipment.Load> + loadDemands__ = + input.readMessage( + LoadDemandsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableLoadDemands() + .getMutableMap() + .put(loadDemands__.getKey(), loadDemands__.getValue()); + break; + } // case 98 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.Shipment.VisitRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -5521,7 +5177,19 @@ public VisitRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new VisitRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -5594,50 +5262,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Load( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 16: - { - amount_ = input.readInt64(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_Shipment_Load_descriptor; @@ -5690,7 +5314,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (amount_ != 0L) { output.writeInt64(2, amount_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -5702,7 +5326,7 @@ public int getSerializedSize() { if (amount_ != 0L) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, amount_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -5719,7 +5343,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.cloud.optimization.v1.Shipment.Load) obj; if (getAmount() != other.getAmount()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -5732,7 +5356,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + AMOUNT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getAmount()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -5865,17 +5489,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.Shipment.Load.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -5966,7 +5583,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.Shipment.Load other) { if (other.getAmount() != 0L) { setAmount(other.getAmount()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -5981,17 +5598,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.Shipment.Load parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 16: + { + amount_ = input.readInt64(); + + break; + } // case 16 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.Shipment.Load) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -6086,7 +5723,19 @@ public Load parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Load(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -7112,7 +6761,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetLoadDemands(), LoadDemandsDefaultEntryHolder.defaultEntry, 14); - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -7206,7 +6855,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(14, loadDemands__); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -7256,7 +6905,7 @@ public boolean equals(final java.lang.Object obj) { if (!getLabel().equals(other.getLabel())) return false; if (getIgnore() != other.getIgnore()) return false; if (!getDemandsList().equals(other.getDemandsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -7323,7 +6972,7 @@ public int hashCode() { hash = (37 * hash) + DEMANDS_FIELD_NUMBER; hash = (53 * hash) + getDemandsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -7476,21 +7125,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.cloud.optimization.v1.Shipment.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getPickupsFieldBuilder(); - getDeliveriesFieldBuilder(); - getDemandsFieldBuilder(); - } } @java.lang.Override @@ -7498,16 +7136,18 @@ public Builder clear() { super.clear(); if (pickupsBuilder_ == null) { pickups_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + pickups_ = null; pickupsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (deliveriesBuilder_ == null) { deliveries_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + deliveries_ = null; deliveriesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); internalGetMutableLoadDemands().clear(); penaltyCost_ = 0D; bitField0_ = (bitField0_ & ~0x00000008); @@ -7539,10 +7179,11 @@ public Builder clear() { if (demandsBuilder_ == null) { demands_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000100); } else { + demands_ = null; demandsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000100); return this; } @@ -7823,7 +7464,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.Shipment other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -7838,17 +7479,185 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.Shipment parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.cloud.optimization.v1.Shipment.VisitRequest m = + input.readMessage( + com.google.cloud.optimization.v1.Shipment.VisitRequest.parser(), + extensionRegistry); + if (pickupsBuilder_ == null) { + ensurePickupsIsMutable(); + pickups_.add(m); + } else { + pickupsBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.cloud.optimization.v1.Shipment.VisitRequest m = + input.readMessage( + com.google.cloud.optimization.v1.Shipment.VisitRequest.parser(), + extensionRegistry); + if (deliveriesBuilder_ == null) { + ensureDeliveriesIsMutable(); + deliveries_.add(m); + } else { + deliveriesBuilder_.addMessage(m); + } + break; + } // case 18 + case 26: + { + com.google.cloud.optimization.v1.CapacityQuantity m = + input.readMessage( + com.google.cloud.optimization.v1.CapacityQuantity.parser(), + extensionRegistry); + if (demandsBuilder_ == null) { + ensureDemandsIsMutable(); + demands_.add(m); + } else { + demandsBuilder_.addMessage(m); + } + break; + } // case 26 + case 33: + { + penaltyCost_ = input.readDouble(); + bitField0_ |= 0x00000008; + break; + } // case 33 + case 40: + { + int v = input.readInt32(); + ensureAllowedVehicleIndicesIsMutable(); + allowedVehicleIndices_.addInt(v); + break; + } // case 40 + case 42: + { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + ensureAllowedVehicleIndicesIsMutable(); + while (input.getBytesUntilLimit() > 0) { + allowedVehicleIndices_.addInt(input.readInt32()); + } + input.popLimit(limit); + break; + } // case 42 + case 49: + { + double v = input.readDouble(); + ensureCostsPerVehicleIsMutable(); + costsPerVehicle_.addDouble(v); + break; + } // case 49 + case 50: + { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + ensureCostsPerVehicleIsMutable(); + while (input.getBytesUntilLimit() > 0) { + costsPerVehicle_.addDouble(input.readDouble()); + } + input.popLimit(limit); + break; + } // case 50 + case 56: + { + int v = input.readInt32(); + ensureCostsPerVehicleIndicesIsMutable(); + costsPerVehicleIndices_.addInt(v); + break; + } // case 56 + case 58: + { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + ensureCostsPerVehicleIndicesIsMutable(); + while (input.getBytesUntilLimit() > 0) { + costsPerVehicleIndices_.addInt(input.readInt32()); + } + input.popLimit(limit); + break; + } // case 58 + case 65: + { + pickupToDeliveryRelativeDetourLimit_ = input.readDouble(); + bitField0_ |= 0x00000080; + break; + } // case 65 + case 74: + { + input.readMessage( + getPickupToDeliveryAbsoluteDetourLimitFieldBuilder().getBuilder(), + extensionRegistry); + + break; + } // case 74 + case 82: + { + input.readMessage( + getPickupToDeliveryTimeLimitFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 82 + case 90: + { + shipmentType_ = input.readStringRequireUtf8(); + + break; + } // case 90 + case 98: + { + label_ = input.readStringRequireUtf8(); + + break; + } // case 98 + case 104: + { + ignore_ = input.readBool(); + + break; + } // case 104 + case 114: + { + com.google.protobuf.MapEntry< + java.lang.String, com.google.cloud.optimization.v1.Shipment.Load> + loadDemands__ = + input.readMessage( + LoadDemandsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableLoadDemands() + .getMutableMap() + .put(loadDemands__.getKey(), loadDemands__.getValue()); + break; + } // case 114 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.Shipment) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -10796,7 +10605,18 @@ public Shipment parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Shipment(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentModel.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentModel.java index 0ad0671..1f14714 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentModel.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentModel.java @@ -66,247 +66,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ShipmentModel( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - shipments_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - shipments_.add( - input.readMessage( - com.google.cloud.optimization.v1.Shipment.parser(), extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - vehicles_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - vehicles_.add( - input.readMessage( - com.google.cloud.optimization.v1.Vehicle.parser(), extensionRegistry)); - break; - } - case 32: - { - bitField0_ |= 0x00000001; - maxActiveVehicles_ = input.readInt32(); - break; - } - case 42: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (globalStartTime_ != null) { - subBuilder = globalStartTime_.toBuilder(); - } - globalStartTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(globalStartTime_); - globalStartTime_ = subBuilder.buildPartial(); - } - - break; - } - case 50: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (globalEndTime_ != null) { - subBuilder = globalEndTime_.toBuilder(); - } - globalEndTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(globalEndTime_); - globalEndTime_ = subBuilder.buildPartial(); - } - - break; - } - case 57: - { - globalDurationCostPerHour_ = input.readDouble(); - break; - } - case 66: - { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - durationDistanceMatrices_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix>(); - mutable_bitField0_ |= 0x00000008; - } - durationDistanceMatrices_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix - .parser(), - extensionRegistry)); - break; - } - case 74: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - durationDistanceMatrixSrcTags_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000010; - } - durationDistanceMatrixSrcTags_.add(s); - break; - } - case 82: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000020) != 0)) { - durationDistanceMatrixDstTags_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000020; - } - durationDistanceMatrixDstTags_.add(s); - break; - } - case 90: - { - if (!((mutable_bitField0_ & 0x00000040) != 0)) { - transitionAttributes_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.TransitionAttributes>(); - mutable_bitField0_ |= 0x00000040; - } - transitionAttributes_.add( - input.readMessage( - com.google.cloud.optimization.v1.TransitionAttributes.parser(), - extensionRegistry)); - break; - } - case 98: - { - if (!((mutable_bitField0_ & 0x00000080) != 0)) { - shipmentTypeIncompatibilities_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.ShipmentTypeIncompatibility>(); - mutable_bitField0_ |= 0x00000080; - } - shipmentTypeIncompatibilities_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentTypeIncompatibility.parser(), - extensionRegistry)); - break; - } - case 106: - { - if (!((mutable_bitField0_ & 0x00000100) != 0)) { - shipmentTypeRequirements_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.ShipmentTypeRequirement>(); - mutable_bitField0_ |= 0x00000100; - } - shipmentTypeRequirements_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentTypeRequirement.parser(), - extensionRegistry)); - break; - } - case 114: - { - if (!((mutable_bitField0_ & 0x00000200) != 0)) { - precedenceRules_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.ShipmentModel.PrecedenceRule>(); - mutable_bitField0_ |= 0x00000200; - } - precedenceRules_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentModel.PrecedenceRule.parser(), - extensionRegistry)); - break; - } - case 122: - { - if (!((mutable_bitField0_ & 0x00000400) != 0)) { - breakRules_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.ShipmentModel.BreakRule>(); - mutable_bitField0_ |= 0x00000400; - } - breakRules_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentModel.BreakRule.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - shipments_ = java.util.Collections.unmodifiableList(shipments_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - vehicles_ = java.util.Collections.unmodifiableList(vehicles_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - durationDistanceMatrices_ = - java.util.Collections.unmodifiableList(durationDistanceMatrices_); - } - if (((mutable_bitField0_ & 0x00000010) != 0)) { - durationDistanceMatrixSrcTags_ = durationDistanceMatrixSrcTags_.getUnmodifiableView(); - } - if (((mutable_bitField0_ & 0x00000020) != 0)) { - durationDistanceMatrixDstTags_ = durationDistanceMatrixDstTags_.getUnmodifiableView(); - } - if (((mutable_bitField0_ & 0x00000040) != 0)) { - transitionAttributes_ = java.util.Collections.unmodifiableList(transitionAttributes_); - } - if (((mutable_bitField0_ & 0x00000080) != 0)) { - shipmentTypeIncompatibilities_ = - java.util.Collections.unmodifiableList(shipmentTypeIncompatibilities_); - } - if (((mutable_bitField0_ & 0x00000100) != 0)) { - shipmentTypeRequirements_ = - java.util.Collections.unmodifiableList(shipmentTypeRequirements_); - } - if (((mutable_bitField0_ & 0x00000200) != 0)) { - precedenceRules_ = java.util.Collections.unmodifiableList(precedenceRules_); - } - if (((mutable_bitField0_ & 0x00000400) != 0)) { - breakRules_ = java.util.Collections.unmodifiableList(breakRules_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentModel_descriptor; @@ -471,72 +230,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DurationDistanceMatrix( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - rows_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix - .Row>(); - mutable_bitField0_ |= 0x00000001; - } - rows_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix.Row - .parser(), - extensionRegistry)); - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - vehicleStartTag_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - rows_ = java.util.Collections.unmodifiableList(rows_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentModel_DurationDistanceMatrix_descriptor; @@ -692,86 +385,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Row( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - durations_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - durations_.add( - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry)); - break; - } - case 17: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - meters_ = newDoubleList(); - mutable_bitField0_ |= 0x00000002; - } - meters_.addDouble(input.readDouble()); - break; - } - case 18: - { - int length = input.readRawVarint32(); - int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - meters_ = newDoubleList(); - mutable_bitField0_ |= 0x00000002; - } - while (input.getBytesUntilLimit() > 0) { - meters_.addDouble(input.readDouble()); - } - input.popLimit(limit); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - durations_ = java.util.Collections.unmodifiableList(durations_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - meters_.makeImmutable(); // C - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentModel_DurationDistanceMatrix_Row_descriptor; @@ -942,7 +555,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < meters_.size(); i++) { output.writeDoubleNoTag(meters_.getDouble(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -964,7 +577,7 @@ public int getSerializedSize() { } metersMemoizedSerializedSize = dataSize; } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -983,7 +596,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDurationsList().equals(other.getDurationsList())) return false; if (!getMetersList().equals(other.getMetersList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1002,7 +615,7 @@ public int hashCode() { hash = (37 * hash) + METERS_FIELD_NUMBER; hash = (53 * hash) + getMetersList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1144,19 +757,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix.Row.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getDurationsFieldBuilder(); - } } @java.lang.Override @@ -1164,10 +768,11 @@ public Builder clear() { super.clear(); if (durationsBuilder_ == null) { durations_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + durations_ = null; durationsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); meters_ = emptyDoubleList(); bitField0_ = (bitField0_ & ~0x00000002); return this; @@ -1310,7 +915,7 @@ public Builder mergeFrom( } onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1325,20 +930,61 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix.Row parsedMessage = - null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.protobuf.Duration m = + input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); + if (durationsBuilder_ == null) { + ensureDurationsIsMutable(); + durations_.add(m); + } else { + durationsBuilder_.addMessage(m); + } + break; + } // case 10 + case 17: + { + double v = input.readDouble(); + ensureMetersIsMutable(); + meters_.addDouble(v); + break; + } // case 17 + case 18: + { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + ensureMetersIsMutable(); + while (input.getBytesUntilLimit() > 0) { + meters_.addDouble(input.readDouble()); + } + input.popLimit(limit); + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix.Row) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1889,7 +1535,19 @@ public Row parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Row(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2081,7 +1739,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(vehicleStartTag_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, vehicleStartTag_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2096,7 +1754,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(vehicleStartTag_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, vehicleStartTag_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2114,7 +1772,7 @@ public boolean equals(final java.lang.Object obj) { if (!getRowsList().equals(other.getRowsList())) return false; if (!getVehicleStartTag().equals(other.getVehicleStartTag())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2131,7 +1789,7 @@ public int hashCode() { } hash = (37 * hash) + VEHICLE_START_TAG_FIELD_NUMBER; hash = (53 * hash) + getVehicleStartTag().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2267,19 +1925,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getRowsFieldBuilder(); - } } @java.lang.Override @@ -2287,10 +1936,11 @@ public Builder clear() { super.clear(); if (rowsBuilder_ == null) { rows_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + rows_ = null; rowsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); vehicleStartTag_ = ""; return this; @@ -2421,7 +2071,7 @@ public Builder mergeFrom( vehicleStartTag_ = other.vehicleStartTag_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2436,19 +2086,52 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix.Row m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix.Row + .parser(), + extensionRegistry); + if (rowsBuilder_ == null) { + ensureRowsIsMutable(); + rows_.add(m); + } else { + rowsBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + vehicleStartTag_ = input.readStringRequireUtf8(); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3063,7 +2746,19 @@ public DurationDistanceMatrix parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DurationDistanceMatrix(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -3238,83 +2933,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private PrecedenceRule( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - bitField0_ |= 0x00000001; - firstIndex_ = input.readInt32(); - break; - } - case 16: - { - bitField0_ |= 0x00000002; - secondIndex_ = input.readInt32(); - break; - } - case 24: - { - firstIsDelivery_ = input.readBool(); - break; - } - case 32: - { - secondIsDelivery_ = input.readBool(); - break; - } - case 42: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (offsetDuration_ != null) { - subBuilder = offsetDuration_.toBuilder(); - } - offsetDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(offsetDuration_); - offsetDuration_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentModel_PrecedenceRule_descriptor; @@ -3510,7 +3128,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (offsetDuration_ != null) { output.writeMessage(5, getOffsetDuration()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3534,7 +3152,7 @@ public int getSerializedSize() { if (offsetDuration_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getOffsetDuration()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3564,7 +3182,7 @@ public boolean equals(final java.lang.Object obj) { if (hasOffsetDuration()) { if (!getOffsetDuration().equals(other.getOffsetDuration())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3591,7 +3209,7 @@ public int hashCode() { hash = (37 * hash) + OFFSET_DURATION_FIELD_NUMBER; hash = (53 * hash) + getOffsetDuration().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3730,17 +3348,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.ShipmentModel.PrecedenceRule.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -3875,7 +3486,7 @@ public Builder mergeFrom( if (other.hasOffsetDuration()) { mergeOffsetDuration(other.getOffsetDuration()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3890,19 +3501,62 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentModel.PrecedenceRule parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + firstIndex_ = input.readInt32(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 16: + { + secondIndex_ = input.readInt32(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 24: + { + firstIsDelivery_ = input.readBool(); + + break; + } // case 24 + case 32: + { + secondIsDelivery_ = input.readBool(); + + break; + } // case 32 + case 42: + { + input.readMessage( + getOffsetDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentModel.PrecedenceRule) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4366,7 +4020,19 @@ public PrecedenceRule parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new PrecedenceRule(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -4564,95 +4230,18 @@ private BreakRule(com.google.protobuf.GeneratedMessageV3.Builder builder) { private BreakRule() { breakRequests_ = java.util.Collections.emptyList(); - frequencyConstraints_ = java.util.Collections.emptyList(); - } - - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance(UnusedPrivateParameter unused) { - return new BreakRule(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - - private BreakRule( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - breakRequests_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.ShipmentModel.BreakRule.BreakRequest>(); - mutable_bitField0_ |= 0x00000001; - } - breakRequests_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentModel.BreakRule.BreakRequest - .parser(), - extensionRegistry)); - break; - } - case 18: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - frequencyConstraints_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.ShipmentModel.BreakRule - .FrequencyConstraint>(); - mutable_bitField0_ |= 0x00000002; - } - frequencyConstraints_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentModel.BreakRule.FrequencyConstraint - .parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - breakRequests_ = java.util.Collections.unmodifiableList(breakRequests_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - frequencyConstraints_ = java.util.Collections.unmodifiableList(frequencyConstraints_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } + frequencyConstraints_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new BreakRule(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + return this.unknownFields; } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @@ -4831,91 +4420,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private BreakRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (earliestStartTime_ != null) { - subBuilder = earliestStartTime_.toBuilder(); - } - earliestStartTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(earliestStartTime_); - earliestStartTime_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (latestStartTime_ != null) { - subBuilder = latestStartTime_.toBuilder(); - } - latestStartTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(latestStartTime_); - latestStartTime_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (minDuration_ != null) { - subBuilder = minDuration_.toBuilder(); - } - minDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(minDuration_); - minDuration_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentModel_BreakRule_BreakRequest_descriptor; @@ -5114,7 +4618,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (minDuration_ != null) { output.writeMessage(3, getMinDuration()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -5133,7 +4637,7 @@ public int getSerializedSize() { if (minDuration_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getMinDuration()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -5162,7 +4666,7 @@ public boolean equals(final java.lang.Object obj) { if (hasMinDuration()) { if (!getMinDuration().equals(other.getMinDuration())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -5185,7 +4689,7 @@ public int hashCode() { hash = (37 * hash) + MIN_DURATION_FIELD_NUMBER; hash = (53 * hash) + getMinDuration().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -5325,17 +4829,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.cloud.optimization.v1.ShipmentModel.BreakRule.BreakRequest.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -5470,7 +4967,7 @@ public Builder mergeFrom( if (other.hasMinDuration()) { mergeMinDuration(other.getMinDuration()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -5485,20 +4982,51 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentModel.BreakRule.BreakRequest parsedMessage = - null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage( + getEarliestStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage( + getLatestStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage(getMinDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentModel.BreakRule.BreakRequest) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -6147,7 +5675,19 @@ public BreakRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BreakRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -6326,76 +5866,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private FrequencyConstraint( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (minBreakDuration_ != null) { - subBuilder = minBreakDuration_.toBuilder(); - } - minBreakDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(minBreakDuration_); - minBreakDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (maxInterBreakDuration_ != null) { - subBuilder = maxInterBreakDuration_.toBuilder(); - } - maxInterBreakDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(maxInterBreakDuration_); - maxInterBreakDuration_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentModel_BreakRule_FrequencyConstraint_descriptor; @@ -6549,7 +6019,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (maxInterBreakDuration_ != null) { output.writeMessage(2, getMaxInterBreakDuration()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -6567,7 +6037,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 2, getMaxInterBreakDuration()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -6593,7 +6063,7 @@ public boolean equals(final java.lang.Object obj) { if (hasMaxInterBreakDuration()) { if (!getMaxInterBreakDuration().equals(other.getMaxInterBreakDuration())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -6612,7 +6082,7 @@ public int hashCode() { hash = (37 * hash) + MAX_INTER_BREAK_DURATION_FIELD_NUMBER; hash = (53 * hash) + getMaxInterBreakDuration().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -6786,17 +6256,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using // com.google.cloud.optimization.v1.ShipmentModel.BreakRule.FrequencyConstraint.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -6921,7 +6384,7 @@ public Builder mergeFrom( if (other.hasMaxInterBreakDuration()) { mergeMaxInterBreakDuration(other.getMaxInterBreakDuration()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -6936,20 +6399,45 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentModel.BreakRule.FrequencyConstraint - parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage( + getMinBreakDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage( + getMaxInterBreakDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentModel.BreakRule.FrequencyConstraint) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -7424,7 +6912,19 @@ public FrequencyConstraint parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new FrequencyConstraint(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -7642,7 +7142,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < frequencyConstraints_.size(); i++) { output.writeMessage(2, frequencyConstraints_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -7659,7 +7159,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 2, frequencyConstraints_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -7677,7 +7177,7 @@ public boolean equals(final java.lang.Object obj) { if (!getBreakRequestsList().equals(other.getBreakRequestsList())) return false; if (!getFrequencyConstraintsList().equals(other.getFrequencyConstraintsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -7696,7 +7196,7 @@ public int hashCode() { hash = (37 * hash) + FREQUENCY_CONSTRAINTS_FIELD_NUMBER; hash = (53 * hash) + getFrequencyConstraintsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -7838,20 +7338,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.ShipmentModel.BreakRule.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getBreakRequestsFieldBuilder(); - getFrequencyConstraintsFieldBuilder(); - } } @java.lang.Override @@ -7859,16 +7349,18 @@ public Builder clear() { super.clear(); if (breakRequestsBuilder_ == null) { breakRequests_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + breakRequests_ = null; breakRequestsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (frequencyConstraintsBuilder_ == null) { frequencyConstraints_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + frequencyConstraints_ = null; frequencyConstraintsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -8021,7 +7513,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.ShipmentModel.BreakRul } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -8036,18 +7528,61 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentModel.BreakRule parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.cloud.optimization.v1.ShipmentModel.BreakRule.BreakRequest m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentModel.BreakRule.BreakRequest + .parser(), + extensionRegistry); + if (breakRequestsBuilder_ == null) { + ensureBreakRequestsIsMutable(); + breakRequests_.add(m); + } else { + breakRequestsBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.cloud.optimization.v1.ShipmentModel.BreakRule.FrequencyConstraint m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentModel.BreakRule + .FrequencyConstraint.parser(), + extensionRegistry); + if (frequencyConstraintsBuilder_ == null) { + ensureFrequencyConstraintsIsMutable(); + frequencyConstraints_.add(m); + } else { + frequencyConstraintsBuilder_.addMessage(m); + } + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentModel.BreakRule) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -8944,7 +8479,19 @@ public BreakRule parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BreakRule(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -10479,7 +10026,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < breakRules_.size(); i++) { output.writeMessage(15, breakRules_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -10549,7 +10096,7 @@ public int getSerializedSize() { for (int i = 0; i < breakRules_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(15, breakRules_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -10594,7 +10141,7 @@ public boolean equals(final java.lang.Object obj) { return false; if (!getPrecedenceRulesList().equals(other.getPrecedenceRulesList())) return false; if (!getBreakRulesList().equals(other.getBreakRulesList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -10662,7 +10209,7 @@ public int hashCode() { hash = (37 * hash) + BREAK_RULES_FIELD_NUMBER; hash = (53 * hash) + getBreakRulesList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -10796,26 +10343,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.ShipmentModel.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getShipmentsFieldBuilder(); - getVehiclesFieldBuilder(); - getDurationDistanceMatricesFieldBuilder(); - getTransitionAttributesFieldBuilder(); - getShipmentTypeIncompatibilitiesFieldBuilder(); - getShipmentTypeRequirementsFieldBuilder(); - getPrecedenceRulesFieldBuilder(); - getBreakRulesFieldBuilder(); - } } @java.lang.Override @@ -10823,16 +10354,18 @@ public Builder clear() { super.clear(); if (shipmentsBuilder_ == null) { shipments_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + shipments_ = null; shipmentsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (vehiclesBuilder_ == null) { vehicles_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + vehicles_ = null; vehiclesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); maxActiveVehicles_ = 0; bitField0_ = (bitField0_ & ~0x00000004); if (globalStartTimeBuilder_ == null) { @@ -10851,44 +10384,50 @@ public Builder clear() { if (durationDistanceMatricesBuilder_ == null) { durationDistanceMatrices_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); } else { + durationDistanceMatrices_ = null; durationDistanceMatricesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000008); durationDistanceMatrixSrcTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000010); durationDistanceMatrixDstTags_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000020); if (transitionAttributesBuilder_ == null) { transitionAttributes_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000040); } else { + transitionAttributes_ = null; transitionAttributesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000040); if (shipmentTypeIncompatibilitiesBuilder_ == null) { shipmentTypeIncompatibilities_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); } else { + shipmentTypeIncompatibilities_ = null; shipmentTypeIncompatibilitiesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000080); if (shipmentTypeRequirementsBuilder_ == null) { shipmentTypeRequirements_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000100); } else { + shipmentTypeRequirements_ = null; shipmentTypeRequirementsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000100); if (precedenceRulesBuilder_ == null) { precedenceRules_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000200); } else { + precedenceRules_ = null; precedenceRulesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000200); if (breakRulesBuilder_ == null) { breakRules_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000400); } else { + breakRules_ = null; breakRulesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000400); return this; } @@ -11317,7 +10856,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.ShipmentModel other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -11332,17 +10871,180 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentModel parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.cloud.optimization.v1.Shipment m = + input.readMessage( + com.google.cloud.optimization.v1.Shipment.parser(), extensionRegistry); + if (shipmentsBuilder_ == null) { + ensureShipmentsIsMutable(); + shipments_.add(m); + } else { + shipmentsBuilder_.addMessage(m); + } + break; + } // case 10 + case 18: + { + com.google.cloud.optimization.v1.Vehicle m = + input.readMessage( + com.google.cloud.optimization.v1.Vehicle.parser(), extensionRegistry); + if (vehiclesBuilder_ == null) { + ensureVehiclesIsMutable(); + vehicles_.add(m); + } else { + vehiclesBuilder_.addMessage(m); + } + break; + } // case 18 + case 32: + { + maxActiveVehicles_ = input.readInt32(); + bitField0_ |= 0x00000004; + break; + } // case 32 + case 42: + { + input.readMessage(getGlobalStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + case 50: + { + input.readMessage(getGlobalEndTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 50 + case 57: + { + globalDurationCostPerHour_ = input.readDouble(); + + break; + } // case 57 + case 66: + { + com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentModel.DurationDistanceMatrix + .parser(), + extensionRegistry); + if (durationDistanceMatricesBuilder_ == null) { + ensureDurationDistanceMatricesIsMutable(); + durationDistanceMatrices_.add(m); + } else { + durationDistanceMatricesBuilder_.addMessage(m); + } + break; + } // case 66 + case 74: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureDurationDistanceMatrixSrcTagsIsMutable(); + durationDistanceMatrixSrcTags_.add(s); + break; + } // case 74 + case 82: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureDurationDistanceMatrixDstTagsIsMutable(); + durationDistanceMatrixDstTags_.add(s); + break; + } // case 82 + case 90: + { + com.google.cloud.optimization.v1.TransitionAttributes m = + input.readMessage( + com.google.cloud.optimization.v1.TransitionAttributes.parser(), + extensionRegistry); + if (transitionAttributesBuilder_ == null) { + ensureTransitionAttributesIsMutable(); + transitionAttributes_.add(m); + } else { + transitionAttributesBuilder_.addMessage(m); + } + break; + } // case 90 + case 98: + { + com.google.cloud.optimization.v1.ShipmentTypeIncompatibility m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentTypeIncompatibility.parser(), + extensionRegistry); + if (shipmentTypeIncompatibilitiesBuilder_ == null) { + ensureShipmentTypeIncompatibilitiesIsMutable(); + shipmentTypeIncompatibilities_.add(m); + } else { + shipmentTypeIncompatibilitiesBuilder_.addMessage(m); + } + break; + } // case 98 + case 106: + { + com.google.cloud.optimization.v1.ShipmentTypeRequirement m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentTypeRequirement.parser(), + extensionRegistry); + if (shipmentTypeRequirementsBuilder_ == null) { + ensureShipmentTypeRequirementsIsMutable(); + shipmentTypeRequirements_.add(m); + } else { + shipmentTypeRequirementsBuilder_.addMessage(m); + } + break; + } // case 106 + case 114: + { + com.google.cloud.optimization.v1.ShipmentModel.PrecedenceRule m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentModel.PrecedenceRule.parser(), + extensionRegistry); + if (precedenceRulesBuilder_ == null) { + ensurePrecedenceRulesIsMutable(); + precedenceRules_.add(m); + } else { + precedenceRulesBuilder_.addMessage(m); + } + break; + } // case 114 + case 122: + { + com.google.cloud.optimization.v1.ShipmentModel.BreakRule m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentModel.BreakRule.parser(), + extensionRegistry); + if (breakRulesBuilder_ == null) { + ensureBreakRulesIsMutable(); + breakRules_.add(m); + } else { + breakRulesBuilder_.addMessage(m); + } + break; + } // case 122 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.ShipmentModel) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -17171,7 +16873,18 @@ public ShipmentModel parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ShipmentModel(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentRoute.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentRoute.java index 72c0ed5..ec9906e 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentRoute.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentRoute.java @@ -134,262 +134,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ShipmentRoute( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - vehicleIndex_ = input.readInt32(); - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - vehicleLabel_ = s; - break; - } - case 42: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (vehicleStartTime_ != null) { - subBuilder = vehicleStartTime_.toBuilder(); - } - vehicleStartTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(vehicleStartTime_); - vehicleStartTime_ = subBuilder.buildPartial(); - } - - break; - } - case 50: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (vehicleEndTime_ != null) { - subBuilder = vehicleEndTime_.toBuilder(); - } - vehicleEndTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(vehicleEndTime_); - vehicleEndTime_ = subBuilder.buildPartial(); - } - - break; - } - case 58: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - visits_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - visits_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.Visit.parser(), - extensionRegistry)); - break; - } - case 66: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - transitions_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.ShipmentRoute.Transition>(); - mutable_bitField0_ |= 0x00000002; - } - transitions_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.Transition.parser(), - extensionRegistry)); - break; - } - case 72: - { - hasTrafficInfeasibilities_ = input.readBool(); - break; - } - case 82: - { - com.google.cloud.optimization.v1.ShipmentRoute.EncodedPolyline.Builder subBuilder = - null; - if (routePolyline_ != null) { - subBuilder = routePolyline_.toBuilder(); - } - routePolyline_ = - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.EncodedPolyline.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(routePolyline_); - routePolyline_ = subBuilder.buildPartial(); - } - - break; - } - case 90: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - breaks_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - breaks_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.Break.parser(), - extensionRegistry)); - break; - } - case 98: - { - com.google.cloud.optimization.v1.AggregatedMetrics.Builder subBuilder = null; - if (metrics_ != null) { - subBuilder = metrics_.toBuilder(); - } - metrics_ = - input.readMessage( - com.google.cloud.optimization.v1.AggregatedMetrics.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(metrics_); - metrics_ = subBuilder.buildPartial(); - } - - break; - } - case 106: - { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - endLoads_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - endLoads_.add( - input.readMessage( - com.google.cloud.optimization.v1.CapacityQuantity.parser(), - extensionRegistry)); - break; - } - case 114: - { - if (!((mutable_bitField0_ & 0x00000020) != 0)) { - travelSteps_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.ShipmentRoute.TravelStep>(); - mutable_bitField0_ |= 0x00000020; - } - travelSteps_.add( - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.TravelStep.parser(), - extensionRegistry)); - break; - } - case 122: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (vehicleDetour_ != null) { - subBuilder = vehicleDetour_.toBuilder(); - } - vehicleDetour_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(vehicleDetour_); - vehicleDetour_ = subBuilder.buildPartial(); - } - - break; - } - case 130: - { - com.google.cloud.optimization.v1.ShipmentRoute.Delay.Builder subBuilder = null; - if (delayBeforeVehicleEnd_ != null) { - subBuilder = delayBeforeVehicleEnd_.toBuilder(); - } - delayBeforeVehicleEnd_ = - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.Delay.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(delayBeforeVehicleEnd_); - delayBeforeVehicleEnd_ = subBuilder.buildPartial(); - } - - break; - } - case 138: - { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - routeCosts_ = - com.google.protobuf.MapField.newMapField( - RouteCostsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000008; - } - com.google.protobuf.MapEntry routeCosts__ = - input.readMessage( - RouteCostsDefaultEntryHolder.defaultEntry.getParserForType(), - extensionRegistry); - routeCosts_.getMutableMap().put(routeCosts__.getKey(), routeCosts__.getValue()); - break; - } - case 145: - { - routeTotalCost_ = input.readDouble(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - visits_ = java.util.Collections.unmodifiableList(visits_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - transitions_ = java.util.Collections.unmodifiableList(transitions_); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - breaks_ = java.util.Collections.unmodifiableList(breaks_); - } - if (((mutable_bitField0_ & 0x00000010) != 0)) { - endLoads_ = java.util.Collections.unmodifiableList(endLoads_); - } - if (((mutable_bitField0_ & 0x00000020) != 0)) { - travelSteps_ = java.util.Collections.unmodifiableList(travelSteps_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentRoute_descriptor; @@ -527,75 +271,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Delay( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (startTime_ != null) { - subBuilder = startTime_.toBuilder(); - } - startTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(startTime_); - startTime_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (duration_ != null) { - subBuilder = duration_.toBuilder(); - } - duration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(duration_); - duration_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentRoute_Delay_descriptor; @@ -723,7 +398,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (duration_ != null) { output.writeMessage(2, getDuration()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -738,7 +413,7 @@ public int getSerializedSize() { if (duration_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getDuration()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -762,7 +437,7 @@ public boolean equals(final java.lang.Object obj) { if (hasDuration()) { if (!getDuration().equals(other.getDuration())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -781,7 +456,7 @@ public int hashCode() { hash = (37 * hash) + DURATION_FIELD_NUMBER; hash = (53 * hash) + getDuration().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -915,17 +590,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.ShipmentRoute.Delay.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1038,7 +706,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.ShipmentRoute.Delay ot if (other.hasDuration()) { mergeDuration(other.getDuration()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1053,18 +721,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentRoute.Delay parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentRoute.Delay) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1465,7 +1158,19 @@ public Delay parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Delay(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2035,171 +1740,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Visit( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - shipmentIndex_ = input.readInt32(); - break; - } - case 16: - { - isPickup_ = input.readBool(); - break; - } - case 24: - { - visitRequestIndex_ = input.readInt32(); - break; - } - case 34: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (startTime_ != null) { - subBuilder = startTime_.toBuilder(); - } - startTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(startTime_); - startTime_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - demands_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - demands_.add( - input.readMessage( - com.google.cloud.optimization.v1.CapacityQuantity.parser(), - extensionRegistry)); - break; - } - case 50: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (detour_ != null) { - subBuilder = detour_.toBuilder(); - } - detour_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(detour_); - detour_ = subBuilder.buildPartial(); - } - - break; - } - case 58: - { - java.lang.String s = input.readStringRequireUtf8(); - - shipmentLabel_ = s; - break; - } - case 66: - { - java.lang.String s = input.readStringRequireUtf8(); - - visitLabel_ = s; - break; - } - case 74: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - arrivalLoads_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - arrivalLoads_.add( - input.readMessage( - com.google.cloud.optimization.v1.CapacityQuantity.parser(), - extensionRegistry)); - break; - } - case 82: - { - com.google.cloud.optimization.v1.ShipmentRoute.Delay.Builder subBuilder = null; - if (delayBeforeStart_ != null) { - subBuilder = delayBeforeStart_.toBuilder(); - } - delayBeforeStart_ = - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.Delay.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(delayBeforeStart_); - delayBeforeStart_ = subBuilder.buildPartial(); - } - - break; - } - case 90: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - loadDemands_ = - com.google.protobuf.MapField.newMapField( - LoadDemandsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry< - java.lang.String, com.google.cloud.optimization.v1.Shipment.Load> - loadDemands__ = - input.readMessage( - LoadDemandsDefaultEntryHolder.defaultEntry.getParserForType(), - extensionRegistry); - loadDemands_.getMutableMap().put(loadDemands__.getKey(), loadDemands__.getValue()); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000004) != 0)) { - demands_ = java.util.Collections.unmodifiableList(demands_); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - arrivalLoads_ = java.util.Collections.unmodifiableList(arrivalLoads_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentRoute_Visit_descriptor; @@ -2962,7 +2502,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetLoadDemands(), LoadDemandsDefaultEntryHolder.defaultEntry, 11); - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3013,7 +2553,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(11, loadDemands__); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3049,7 +2589,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDelayBeforeStart().equals(other.getDelayBeforeStart())) return false; } if (!getDemandsList().equals(other.getDemandsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3094,7 +2634,7 @@ public int hashCode() { hash = (37 * hash) + DEMANDS_FIELD_NUMBER; hash = (53 * hash) + getDemandsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3247,20 +2787,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.cloud.optimization.v1.ShipmentRoute.Visit.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getArrivalLoadsFieldBuilder(); - getDemandsFieldBuilder(); - } } @java.lang.Override @@ -3291,10 +2821,11 @@ public Builder clear() { if (arrivalLoadsBuilder_ == null) { arrivalLoads_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + arrivalLoads_ = null; arrivalLoadsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); if (delayBeforeStartBuilder_ == null) { delayBeforeStart_ = null; } else { @@ -3303,10 +2834,11 @@ public Builder clear() { } if (demandsBuilder_ == null) { demands_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + demands_ = null; demandsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -3508,7 +3040,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.ShipmentRoute.Visit ot } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3523,18 +3055,121 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentRoute.Visit parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + shipmentIndex_ = input.readInt32(); + + break; + } // case 8 + case 16: + { + isPickup_ = input.readBool(); + + break; + } // case 16 + case 24: + { + visitRequestIndex_ = input.readInt32(); + + break; + } // case 24 + case 34: + { + input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + com.google.cloud.optimization.v1.CapacityQuantity m = + input.readMessage( + com.google.cloud.optimization.v1.CapacityQuantity.parser(), + extensionRegistry); + if (demandsBuilder_ == null) { + ensureDemandsIsMutable(); + demands_.add(m); + } else { + demandsBuilder_.addMessage(m); + } + break; + } // case 42 + case 50: + { + input.readMessage(getDetourFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 50 + case 58: + { + shipmentLabel_ = input.readStringRequireUtf8(); + + break; + } // case 58 + case 66: + { + visitLabel_ = input.readStringRequireUtf8(); + + break; + } // case 66 + case 74: + { + com.google.cloud.optimization.v1.CapacityQuantity m = + input.readMessage( + com.google.cloud.optimization.v1.CapacityQuantity.parser(), + extensionRegistry); + if (arrivalLoadsBuilder_ == null) { + ensureArrivalLoadsIsMutable(); + arrivalLoads_.add(m); + } else { + arrivalLoadsBuilder_.addMessage(m); + } + break; + } // case 74 + case 82: + { + input.readMessage( + getDelayBeforeStartFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 82 + case 90: + { + com.google.protobuf.MapEntry< + java.lang.String, com.google.cloud.optimization.v1.Shipment.Load> + loadDemands__ = + input.readMessage( + LoadDemandsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableLoadDemands() + .getMutableMap() + .put(loadDemands__.getKey(), loadDemands__.getValue()); + break; + } // case 90 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentRoute.Visit) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -5815,7 +5450,19 @@ public Visit parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Visit(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -6368,200 +6015,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Transition( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (travelDuration_ != null) { - subBuilder = travelDuration_.toBuilder(); - } - travelDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(travelDuration_); - travelDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 17: - { - travelDistanceMeters_ = input.readDouble(); - break; - } - case 24: - { - trafficInfoUnavailable_ = input.readBool(); - break; - } - case 34: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (delayDuration_ != null) { - subBuilder = delayDuration_.toBuilder(); - } - delayDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(delayDuration_); - delayDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (breakDuration_ != null) { - subBuilder = breakDuration_.toBuilder(); - } - breakDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(breakDuration_); - breakDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 50: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (waitDuration_ != null) { - subBuilder = waitDuration_.toBuilder(); - } - waitDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(waitDuration_); - waitDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 58: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (totalDuration_ != null) { - subBuilder = totalDuration_.toBuilder(); - } - totalDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(totalDuration_); - totalDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 66: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (startTime_ != null) { - subBuilder = startTime_.toBuilder(); - } - startTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(startTime_); - startTime_ = subBuilder.buildPartial(); - } - - break; - } - case 74: - { - com.google.cloud.optimization.v1.ShipmentRoute.EncodedPolyline.Builder subBuilder = - null; - if (routePolyline_ != null) { - subBuilder = routePolyline_.toBuilder(); - } - routePolyline_ = - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.EncodedPolyline.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(routePolyline_); - routePolyline_ = subBuilder.buildPartial(); - } - - break; - } - case 82: - { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - loads_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - loads_.add( - input.readMessage( - com.google.cloud.optimization.v1.CapacityQuantity.parser(), - extensionRegistry)); - break; - } - case 90: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - vehicleLoads_ = - com.google.protobuf.MapField.newMapField( - VehicleLoadsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry< - java.lang.String, - com.google.cloud.optimization.v1.ShipmentRoute.VehicleLoad> - vehicleLoads__ = - input.readMessage( - VehicleLoadsDefaultEntryHolder.defaultEntry.getParserForType(), - extensionRegistry); - vehicleLoads_ - .getMutableMap() - .put(vehicleLoads__.getKey(), vehicleLoads__.getValue()); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { - loads_ = java.util.Collections.unmodifiableList(loads_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentRoute_Transition_descriptor; @@ -7289,7 +6742,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetVehicleLoads(), VehicleLoadsDefaultEntryHolder.defaultEntry, 11); - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -7341,7 +6794,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(11, vehicleLoads__); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -7390,7 +6843,7 @@ public boolean equals(final java.lang.Object obj) { } if (!internalGetVehicleLoads().equals(other.internalGetVehicleLoads())) return false; if (!getLoadsList().equals(other.getLoadsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -7444,7 +6897,7 @@ public int hashCode() { hash = (37 * hash) + LOADS_FIELD_NUMBER; hash = (53 * hash) + getLoadsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -7599,19 +7052,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.cloud.optimization.v1.ShipmentRoute.Transition.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getLoadsFieldBuilder(); - } } @java.lang.Override @@ -7666,10 +7110,11 @@ public Builder clear() { internalGetMutableVehicleLoads().clear(); if (loadsBuilder_ == null) { loads_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + loads_ = null; loadsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -7853,7 +7298,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.ShipmentRoute.Transiti } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -7868,18 +7313,114 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentRoute.Transition parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage( + getTravelDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 17: + { + travelDistanceMeters_ = input.readDouble(); + + break; + } // case 17 + case 24: + { + trafficInfoUnavailable_ = input.readBool(); + + break; + } // case 24 + case 34: + { + input.readMessage(getDelayDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + input.readMessage(getBreakDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + case 50: + { + input.readMessage(getWaitDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 50 + case 58: + { + input.readMessage(getTotalDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 58 + case 66: + { + input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 66 + case 74: + { + input.readMessage(getRoutePolylineFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 74 + case 82: + { + com.google.cloud.optimization.v1.CapacityQuantity m = + input.readMessage( + com.google.cloud.optimization.v1.CapacityQuantity.parser(), + extensionRegistry); + if (loadsBuilder_ == null) { + ensureLoadsIsMutable(); + loads_.add(m); + } else { + loadsBuilder_.addMessage(m); + } + break; + } // case 82 + case 90: + { + com.google.protobuf.MapEntry< + java.lang.String, + com.google.cloud.optimization.v1.ShipmentRoute.VehicleLoad> + vehicleLoads__ = + input.readMessage( + VehicleLoadsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableVehicleLoads() + .getMutableMap() + .put(vehicleLoads__.getKey(), vehicleLoads__.getValue()); + break; + } // case 90 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentRoute.Transition) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -10142,7 +9683,19 @@ public Transition parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Transition(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -10201,60 +9754,16 @@ private VehicleLoad(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private VehicleLoad() {} - - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance(UnusedPrivateParameter unused) { - return new VehicleLoad(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - - private VehicleLoad( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - amount_ = input.readInt64(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { + return new VehicleLoad(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + return this.unknownFields; } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @@ -10308,7 +9817,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (amount_ != 0L) { output.writeInt64(1, amount_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -10320,7 +9829,7 @@ public int getSerializedSize() { if (amount_ != 0L) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(1, amount_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -10337,7 +9846,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.cloud.optimization.v1.ShipmentRoute.VehicleLoad) obj; if (getAmount() != other.getAmount()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -10350,7 +9859,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + AMOUNT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getAmount()); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -10483,17 +9992,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.ShipmentRoute.VehicleLoad.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -10586,7 +10088,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.ShipmentRoute.VehicleL if (other.getAmount() != 0L) { setAmount(other.getAmount()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -10601,18 +10103,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentRoute.VehicleLoad parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + amount_ = input.readInt64(); + + break; + } // case 8 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentRoute.VehicleLoad) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -10705,7 +10226,19 @@ public VehicleLoad parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new VehicleLoad(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -10791,52 +10324,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private EncodedPolyline( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - points_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentRoute_EncodedPolyline_descriptor; @@ -10918,7 +10405,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(points_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, points_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -10930,7 +10417,7 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(points_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, points_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -10947,7 +10434,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.cloud.optimization.v1.ShipmentRoute.EncodedPolyline) obj; if (!getPoints().equals(other.getPoints())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -10960,7 +10447,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + POINTS_FIELD_NUMBER; hash = (53 * hash) + getPoints().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -11095,17 +10582,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.ShipmentRoute.EncodedPolyline.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -11200,7 +10680,7 @@ public Builder mergeFrom( points_ = other.points_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -11215,19 +10695,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentRoute.EncodedPolyline parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + points_ = input.readStringRequireUtf8(); + + break; + } // case 10 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentRoute.EncodedPolyline) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -11372,7 +10870,19 @@ public EncodedPolyline parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EncodedPolyline(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -11499,75 +11009,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Break( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (startTime_ != null) { - subBuilder = startTime_.toBuilder(); - } - startTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(startTime_); - startTime_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (duration_ != null) { - subBuilder = duration_.toBuilder(); - } - duration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(duration_); - duration_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentRoute_Break_descriptor; @@ -11695,7 +11136,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (duration_ != null) { output.writeMessage(2, getDuration()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -11710,7 +11151,7 @@ public int getSerializedSize() { if (duration_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getDuration()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -11734,7 +11175,7 @@ public boolean equals(final java.lang.Object obj) { if (hasDuration()) { if (!getDuration().equals(other.getDuration())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -11753,7 +11194,7 @@ public int hashCode() { hash = (37 * hash) + DURATION_FIELD_NUMBER; hash = (53 * hash) + getDuration().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -11885,17 +11326,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.ShipmentRoute.Break.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -12008,7 +11442,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.ShipmentRoute.Break ot if (other.hasDuration()) { mergeDuration(other.getDuration()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -12023,18 +11457,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentRoute.Break parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentRoute.Break) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -12435,7 +11894,19 @@ public Break parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Break(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -12616,88 +12087,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private TravelStep( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (duration_ != null) { - subBuilder = duration_.toBuilder(); - } - duration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(duration_); - duration_ = subBuilder.buildPartial(); - } - - break; - } - case 17: - { - distanceMeters_ = input.readDouble(); - break; - } - case 24: - { - trafficInfoUnavailable_ = input.readBool(); - break; - } - case 34: - { - com.google.cloud.optimization.v1.ShipmentRoute.EncodedPolyline.Builder subBuilder = - null; - if (routePolyline_ != null) { - subBuilder = routePolyline_.toBuilder(); - } - routePolyline_ = - input.readMessage( - com.google.cloud.optimization.v1.ShipmentRoute.EncodedPolyline.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(routePolyline_); - routePolyline_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentRoute_TravelStep_descriptor; @@ -12886,7 +12275,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (routePolyline_ != null) { output.writeMessage(4, getRoutePolyline()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -12907,7 +12296,7 @@ public int getSerializedSize() { if (routePolyline_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getRoutePolyline()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -12934,7 +12323,7 @@ public boolean equals(final java.lang.Object obj) { if (hasRoutePolyline()) { if (!getRoutePolyline().equals(other.getRoutePolyline())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -12960,7 +12349,7 @@ public int hashCode() { hash = (37 * hash) + ROUTE_POLYLINE_FIELD_NUMBER; hash = (53 * hash) + getRoutePolyline().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -13102,17 +12491,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.ShipmentRoute.TravelStep.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -13237,7 +12619,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.ShipmentRoute.TravelSt if (other.hasRoutePolyline()) { mergeRoutePolyline(other.getRoutePolyline()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -13252,18 +12634,55 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentRoute.TravelStep parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 17: + { + distanceMeters_ = input.readDouble(); + + break; + } // case 17 + case 24: + { + trafficInfoUnavailable_ = input.readBool(); + + break; + } // case 24 + case 34: + { + input.readMessage(getRoutePolylineFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentRoute.TravelStep) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -13831,7 +13250,19 @@ public TravelStep parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new TravelStep(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -14936,7 +14367,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (java.lang.Double.doubleToRawLongBits(routeTotalCost_) != 0) { output.writeDouble(18, routeTotalCost_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -15001,7 +14432,7 @@ public int getSerializedSize() { if (java.lang.Double.doubleToRawLongBits(routeTotalCost_) != 0) { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(18, routeTotalCost_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -15052,7 +14483,7 @@ public boolean equals(final java.lang.Object obj) { if (hasDelayBeforeVehicleEnd()) { if (!getDelayBeforeVehicleEnd().equals(other.getDelayBeforeVehicleEnd())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -15122,7 +14553,7 @@ public int hashCode() { hash = (37 * hash) + DELAY_BEFORE_VEHICLE_END_FIELD_NUMBER; hash = (53 * hash) + getDelayBeforeVehicleEnd().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -15348,23 +14779,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.cloud.optimization.v1.ShipmentRoute.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getVisitsFieldBuilder(); - getTransitionsFieldBuilder(); - getBreaksFieldBuilder(); - getEndLoadsFieldBuilder(); - getTravelStepsFieldBuilder(); - } } @java.lang.Override @@ -15388,16 +14806,18 @@ public Builder clear() { } if (visitsBuilder_ == null) { visits_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + visits_ = null; visitsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); if (transitionsBuilder_ == null) { transitions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); } else { + transitions_ = null; transitionsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000002); hasTrafficInfeasibilities_ = false; if (routePolylineBuilder_ == null) { @@ -15408,10 +14828,11 @@ public Builder clear() { } if (breaksBuilder_ == null) { breaks_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + breaks_ = null; breaksBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (metricsBuilder_ == null) { metrics_ = null; } else { @@ -15423,16 +14844,18 @@ public Builder clear() { if (endLoadsBuilder_ == null) { endLoads_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); } else { + endLoads_ = null; endLoadsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000010); if (travelStepsBuilder_ == null) { travelSteps_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); } else { + travelSteps_ = null; travelStepsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000020); if (vehicleDetourBuilder_ == null) { vehicleDetour_ = null; } else { @@ -15770,7 +15193,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.ShipmentRoute other) { if (other.hasDelayBeforeVehicleEnd()) { mergeDelayBeforeVehicleEnd(other.getDelayBeforeVehicleEnd()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -15785,17 +15208,174 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentRoute parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + vehicleIndex_ = input.readInt32(); + + break; + } // case 8 + case 18: + { + vehicleLabel_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 42: + { + input.readMessage( + getVehicleStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + case 50: + { + input.readMessage(getVehicleEndTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 50 + case 58: + { + com.google.cloud.optimization.v1.ShipmentRoute.Visit m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentRoute.Visit.parser(), + extensionRegistry); + if (visitsBuilder_ == null) { + ensureVisitsIsMutable(); + visits_.add(m); + } else { + visitsBuilder_.addMessage(m); + } + break; + } // case 58 + case 66: + { + com.google.cloud.optimization.v1.ShipmentRoute.Transition m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentRoute.Transition.parser(), + extensionRegistry); + if (transitionsBuilder_ == null) { + ensureTransitionsIsMutable(); + transitions_.add(m); + } else { + transitionsBuilder_.addMessage(m); + } + break; + } // case 66 + case 72: + { + hasTrafficInfeasibilities_ = input.readBool(); + + break; + } // case 72 + case 82: + { + input.readMessage(getRoutePolylineFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 82 + case 90: + { + com.google.cloud.optimization.v1.ShipmentRoute.Break m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentRoute.Break.parser(), + extensionRegistry); + if (breaksBuilder_ == null) { + ensureBreaksIsMutable(); + breaks_.add(m); + } else { + breaksBuilder_.addMessage(m); + } + break; + } // case 90 + case 98: + { + input.readMessage(getMetricsFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 98 + case 106: + { + com.google.cloud.optimization.v1.CapacityQuantity m = + input.readMessage( + com.google.cloud.optimization.v1.CapacityQuantity.parser(), + extensionRegistry); + if (endLoadsBuilder_ == null) { + ensureEndLoadsIsMutable(); + endLoads_.add(m); + } else { + endLoadsBuilder_.addMessage(m); + } + break; + } // case 106 + case 114: + { + com.google.cloud.optimization.v1.ShipmentRoute.TravelStep m = + input.readMessage( + com.google.cloud.optimization.v1.ShipmentRoute.TravelStep.parser(), + extensionRegistry); + if (travelStepsBuilder_ == null) { + ensureTravelStepsIsMutable(); + travelSteps_.add(m); + } else { + travelStepsBuilder_.addMessage(m); + } + break; + } // case 114 + case 122: + { + input.readMessage(getVehicleDetourFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 122 + case 130: + { + input.readMessage( + getDelayBeforeVehicleEndFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 130 + case 138: + { + com.google.protobuf.MapEntry routeCosts__ = + input.readMessage( + RouteCostsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableRouteCosts() + .getMutableMap() + .put(routeCosts__.getKey(), routeCosts__.getValue()); + break; + } // case 138 + case 145: + { + routeTotalCost_ = input.readDouble(); + + break; + } // case 145 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.ShipmentRoute) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -19708,7 +19288,18 @@ public ShipmentRoute parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ShipmentRoute(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentTypeIncompatibility.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentTypeIncompatibility.java index a70ac33..64d05d9 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentTypeIncompatibility.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentTypeIncompatibility.java @@ -55,66 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ShipmentTypeIncompatibility( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - types_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - types_.add(s); - break; - } - case 16: - { - int rawValue = input.readEnum(); - - incompatibilityMode_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - types_ = types_.getUnmodifiableView(); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentTypeIncompatibility_descriptor; @@ -441,7 +381,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io .getNumber()) { output.writeEnum(2, incompatibilityMode_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -464,7 +404,7 @@ public int getSerializedSize() { .getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, incompatibilityMode_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -482,7 +422,7 @@ public boolean equals(final java.lang.Object obj) { if (!getTypesList().equals(other.getTypesList())) return false; if (incompatibilityMode_ != other.incompatibilityMode_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -499,7 +439,7 @@ public int hashCode() { } hash = (37 * hash) + INCOMPATIBILITY_MODE_FIELD_NUMBER; hash = (53 * hash) + incompatibilityMode_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -631,17 +571,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.ShipmentTypeIncompatibility.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -750,7 +683,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.ShipmentTypeIncompatib if (other.incompatibilityMode_ != 0) { setIncompatibilityModeValue(other.getIncompatibilityModeValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -765,18 +698,44 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentTypeIncompatibility parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureTypesIsMutable(); + types_.add(s); + break; + } // case 10 + case 16: + { + incompatibilityMode_ = input.readEnum(); + + break; + } // case 16 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentTypeIncompatibility) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1099,7 +1058,18 @@ public ShipmentTypeIncompatibility parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ShipmentTypeIncompatibility(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentTypeRequirement.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentTypeRequirement.java index 4045d89..8b73f08 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentTypeRequirement.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/ShipmentTypeRequirement.java @@ -55,79 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private ShipmentTypeRequirement( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - requiredShipmentTypeAlternatives_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - requiredShipmentTypeAlternatives_.add(s); - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - dependentShipmentTypes_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000002; - } - dependentShipmentTypes_.add(s); - break; - } - case 24: - { - int rawValue = input.readEnum(); - - requirementMode_ = rawValue; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - requiredShipmentTypeAlternatives_ = requiredShipmentTypeAlternatives_.getUnmodifiableView(); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - dependentShipmentTypes_ = dependentShipmentTypes_.getUnmodifiableView(); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_ShipmentTypeRequirement_descriptor; @@ -558,7 +485,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io .getNumber()) { output.writeEnum(3, requirementMode_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -589,7 +516,7 @@ public int getSerializedSize() { .getNumber()) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(3, requirementMode_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -610,7 +537,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDependentShipmentTypesList().equals(other.getDependentShipmentTypesList())) return false; if (requirementMode_ != other.requirementMode_) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -631,7 +558,7 @@ public int hashCode() { } hash = (37 * hash) + REQUIREMENT_MODE_FIELD_NUMBER; hash = (53 * hash) + requirementMode_; - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -762,17 +689,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.ShipmentTypeRequirement.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -896,7 +816,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.ShipmentTypeRequiremen if (other.requirementMode_ != 0) { setRequirementModeValue(other.getRequirementModeValue()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -911,18 +831,51 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.ShipmentTypeRequirement parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureRequiredShipmentTypeAlternativesIsMutable(); + requiredShipmentTypeAlternatives_.add(s); + break; + } // case 10 + case 18: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureDependentShipmentTypesIsMutable(); + dependentShipmentTypes_.add(s); + break; + } // case 18 + case 24: + { + requirementMode_ = input.readEnum(); + + break; + } // case 24 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.ShipmentTypeRequirement) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1451,7 +1404,18 @@ public ShipmentTypeRequirement parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ShipmentTypeRequirement(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/SkippedShipment.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/SkippedShipment.java index 6d6fbcc..b5bfd20 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/SkippedShipment.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/SkippedShipment.java @@ -55,75 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private SkippedShipment( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - index_ = input.readInt32(); - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - label_ = s; - break; - } - case 26: - { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - reasons_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.SkippedShipment.Reason>(); - mutable_bitField0_ |= 0x00000001; - } - reasons_.add( - input.readMessage( - com.google.cloud.optimization.v1.SkippedShipment.Reason.parser(), - extensionRegistry)); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - reasons_ = java.util.Collections.unmodifiableList(reasons_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_SkippedShipment_descriptor; @@ -283,66 +214,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Reason( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - code_ = rawValue; - break; - } - case 16: - { - bitField0_ |= 0x00000001; - exampleVehicleIndex_ = input.readInt32(); - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - exampleExceededCapacityType_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_SkippedShipment_Reason_descriptor; @@ -809,7 +680,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(exampleExceededCapacityType_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, exampleExceededCapacityType_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -831,7 +702,7 @@ public int getSerializedSize() { com.google.protobuf.GeneratedMessageV3.computeStringSize( 3, exampleExceededCapacityType_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -854,7 +725,7 @@ public boolean equals(final java.lang.Object obj) { } if (!getExampleExceededCapacityType().equals(other.getExampleExceededCapacityType())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -873,7 +744,7 @@ public int hashCode() { } hash = (37 * hash) + EXAMPLE_EXCEEDED_CAPACITY_TYPE_FIELD_NUMBER; hash = (53 * hash) + getExampleExceededCapacityType().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1030,17 +901,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.SkippedShipment.Reason.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1150,7 +1014,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.SkippedShipment.Reason exampleExceededCapacityType_ = other.exampleExceededCapacityType_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1165,18 +1029,49 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.SkippedShipment.Reason parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + code_ = input.readEnum(); + + break; + } // case 8 + case 16: + { + exampleVehicleIndex_ = input.readInt32(); + bitField0_ |= 0x00000001; + break; + } // case 16 + case 26: + { + exampleExceededCapacityType_ = input.readStringRequireUtf8(); + + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.SkippedShipment.Reason) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1490,7 +1385,19 @@ public Reason parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Reason(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1677,7 +1584,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < reasons_.size(); i++) { output.writeMessage(3, reasons_.get(i)); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1695,7 +1602,7 @@ public int getSerializedSize() { for (int i = 0; i < reasons_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, reasons_.get(i)); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1714,7 +1621,7 @@ public boolean equals(final java.lang.Object obj) { if (getIndex() != other.getIndex()) return false; if (!getLabel().equals(other.getLabel())) return false; if (!getReasonsList().equals(other.getReasonsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1733,7 +1640,7 @@ public int hashCode() { hash = (37 * hash) + REASONS_FIELD_NUMBER; hash = (53 * hash) + getReasonsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1864,19 +1771,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.SkippedShipment.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getReasonsFieldBuilder(); - } } @java.lang.Override @@ -1888,10 +1786,11 @@ public Builder clear() { if (reasonsBuilder_ == null) { reasons_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); } else { + reasons_ = null; reasonsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -2015,7 +1914,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.SkippedShipment other) } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2030,17 +1929,57 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.SkippedShipment parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + index_ = input.readInt32(); + + break; + } // case 8 + case 18: + { + label_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 26: + { + com.google.cloud.optimization.v1.SkippedShipment.Reason m = + input.readMessage( + com.google.cloud.optimization.v1.SkippedShipment.Reason.parser(), + extensionRegistry); + if (reasonsBuilder_ == null) { + ensureReasonsIsMutable(); + reasons_.add(m); + } else { + reasonsBuilder_.addMessage(m); + } + break; + } // case 26 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.SkippedShipment) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2625,7 +2564,18 @@ public SkippedShipment parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SkippedShipment(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/TimeWindow.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/TimeWindow.java index 796212e..74a8a55 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/TimeWindow.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/TimeWindow.java @@ -66,118 +66,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private TimeWindow( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (startTime_ != null) { - subBuilder = startTime_.toBuilder(); - } - startTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(startTime_); - startTime_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (endTime_ != null) { - subBuilder = endTime_.toBuilder(); - } - endTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(endTime_); - endTime_ = subBuilder.buildPartial(); - } - - break; - } - case 26: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (softStartTime_ != null) { - subBuilder = softStartTime_.toBuilder(); - } - softStartTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(softStartTime_); - softStartTime_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - com.google.protobuf.Timestamp.Builder subBuilder = null; - if (softEndTime_ != null) { - subBuilder = softEndTime_.toBuilder(); - } - softEndTime_ = - input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(softEndTime_); - softEndTime_ = subBuilder.buildPartial(); - } - - break; - } - case 41: - { - bitField0_ |= 0x00000001; - costPerHourBeforeSoftStartTime_ = input.readDouble(); - break; - } - case 49: - { - bitField0_ |= 0x00000002; - costPerHourAfterSoftEndTime_ = input.readDouble(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_TimeWindow_descriptor; @@ -516,7 +404,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000002) != 0)) { output.writeDouble(6, costPerHourAfterSoftEndTime_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -546,7 +434,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeDoubleSize(6, costPerHourAfterSoftEndTime_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -591,7 +479,7 @@ public boolean equals(final java.lang.Object obj) { != java.lang.Double.doubleToLongBits(other.getCostPerHourAfterSoftEndTime())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -632,7 +520,7 @@ public int hashCode() { + com.google.protobuf.Internal.hashLong( java.lang.Double.doubleToLongBits(getCostPerHourAfterSoftEndTime())); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -777,17 +665,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.TimeWindow.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -946,7 +827,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.TimeWindow other) { if (other.hasCostPerHourAfterSoftEndTime()) { setCostPerHourAfterSoftEndTime(other.getCostPerHourAfterSoftEndTime()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -961,17 +842,67 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.TimeWindow parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 26: + { + input.readMessage(getSoftStartTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + input.readMessage(getSoftEndTimeFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 41: + { + costPerHourBeforeSoftStartTime_ = input.readDouble(); + bitField0_ |= 0x00000001; + break; + } // case 41 + case 49: + { + costPerHourAfterSoftEndTime_ = input.readDouble(); + bitField0_ |= 0x00000002; + break; + } // case 49 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.TimeWindow) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1953,7 +1884,18 @@ public TimeWindow parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new TimeWindow(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/TransitionAttributes.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/TransitionAttributes.java index ffd236f..65d43e5 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/TransitionAttributes.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/TransitionAttributes.java @@ -58,113 +58,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private TransitionAttributes( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - srcTag_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - excludedSrcTag_ = s; - break; - } - case 26: - { - java.lang.String s = input.readStringRequireUtf8(); - - dstTag_ = s; - break; - } - case 34: - { - java.lang.String s = input.readStringRequireUtf8(); - - excludedDstTag_ = s; - break; - } - case 41: - { - cost_ = input.readDouble(); - break; - } - case 49: - { - costPerKilometer_ = input.readDouble(); - break; - } - case 58: - { - com.google.cloud.optimization.v1.DistanceLimit.Builder subBuilder = null; - if (distanceLimit_ != null) { - subBuilder = distanceLimit_.toBuilder(); - } - distanceLimit_ = - input.readMessage( - com.google.cloud.optimization.v1.DistanceLimit.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(distanceLimit_); - distanceLimit_ = subBuilder.buildPartial(); - } - - break; - } - case 66: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (delay_ != null) { - subBuilder = delay_.toBuilder(); - } - delay_ = input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(delay_); - delay_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_TransitionAttributes_descriptor; @@ -580,7 +473,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (delay_ != null) { output.writeMessage(8, getDelay()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -613,7 +506,7 @@ public int getSerializedSize() { if (delay_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getDelay()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -645,7 +538,7 @@ public boolean equals(final java.lang.Object obj) { if (hasDelay()) { if (!getDelay().equals(other.getDelay())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -681,7 +574,7 @@ public int hashCode() { hash = (37 * hash) + DELAY_FIELD_NUMBER; hash = (53 * hash) + getDelay().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -814,17 +707,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.TransitionAttributes.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -975,7 +861,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.TransitionAttributes o if (other.hasDelay()) { mergeDelay(other.getDelay()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -990,18 +876,79 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.TransitionAttributes parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + srcTag_ = input.readStringRequireUtf8(); + + break; + } // case 10 + case 18: + { + excludedSrcTag_ = input.readStringRequireUtf8(); + + break; + } // case 18 + case 26: + { + dstTag_ = input.readStringRequireUtf8(); + + break; + } // case 26 + case 34: + { + excludedDstTag_ = input.readStringRequireUtf8(); + + break; + } // case 34 + case 41: + { + cost_ = input.readDouble(); + + break; + } // case 41 + case 49: + { + costPerKilometer_ = input.readDouble(); + + break; + } // case 49 + case 58: + { + input.readMessage(getDistanceLimitFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 58 + case 66: + { + input.readMessage(getDelayFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 66 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.TransitionAttributes) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2027,7 +1974,18 @@ public TransitionAttributes parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new TransitionAttributes(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Vehicle.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Vehicle.java index 0db6793..4e5aec3 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Vehicle.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Vehicle.java @@ -64,400 +64,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Vehicle( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - int rawValue = input.readEnum(); - - travelMode_ = rawValue; - break; - } - case 26: - { - com.google.type.LatLng.Builder subBuilder = null; - if (startLocation_ != null) { - subBuilder = startLocation_.toBuilder(); - } - startLocation_ = - input.readMessage(com.google.type.LatLng.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(startLocation_); - startLocation_ = subBuilder.buildPartial(); - } - - break; - } - case 34: - { - com.google.cloud.optimization.v1.Waypoint.Builder subBuilder = null; - if (startWaypoint_ != null) { - subBuilder = startWaypoint_.toBuilder(); - } - startWaypoint_ = - input.readMessage( - com.google.cloud.optimization.v1.Waypoint.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(startWaypoint_); - startWaypoint_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - com.google.type.LatLng.Builder subBuilder = null; - if (endLocation_ != null) { - subBuilder = endLocation_.toBuilder(); - } - endLocation_ = input.readMessage(com.google.type.LatLng.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(endLocation_); - endLocation_ = subBuilder.buildPartial(); - } - - break; - } - case 50: - { - com.google.cloud.optimization.v1.Waypoint.Builder subBuilder = null; - if (endWaypoint_ != null) { - subBuilder = endWaypoint_.toBuilder(); - } - endWaypoint_ = - input.readMessage( - com.google.cloud.optimization.v1.Waypoint.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(endWaypoint_); - endWaypoint_ = subBuilder.buildPartial(); - } - - break; - } - case 58: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - startTags_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - startTags_.add(s); - break; - } - case 66: - { - java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - endTags_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000002; - } - endTags_.add(s); - break; - } - case 74: - { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - startTimeWindows_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - startTimeWindows_.add( - input.readMessage( - com.google.cloud.optimization.v1.TimeWindow.parser(), extensionRegistry)); - break; - } - case 82: - { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { - endTimeWindows_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - endTimeWindows_.add( - input.readMessage( - com.google.cloud.optimization.v1.TimeWindow.parser(), extensionRegistry)); - break; - } - case 89: - { - bitField0_ |= 0x00000001; - travelDurationMultiple_ = input.readDouble(); - break; - } - case 96: - { - int rawValue = input.readEnum(); - - unloadingPolicy_ = rawValue; - break; - } - case 106: - { - if (!((mutable_bitField0_ & 0x00000100) != 0)) { - capacities_ = - new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000100; - } - capacities_.add( - input.readMessage( - com.google.cloud.optimization.v1.CapacityQuantity.parser(), - extensionRegistry)); - break; - } - case 114: - { - if (!((mutable_bitField0_ & 0x00000200) != 0)) { - startLoadIntervals_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.CapacityQuantityInterval>(); - mutable_bitField0_ |= 0x00000200; - } - startLoadIntervals_.add( - input.readMessage( - com.google.cloud.optimization.v1.CapacityQuantityInterval.parser(), - extensionRegistry)); - break; - } - case 122: - { - if (!((mutable_bitField0_ & 0x00000400) != 0)) { - endLoadIntervals_ = - new java.util.ArrayList< - com.google.cloud.optimization.v1.CapacityQuantityInterval>(); - mutable_bitField0_ |= 0x00000400; - } - endLoadIntervals_.add( - input.readMessage( - com.google.cloud.optimization.v1.CapacityQuantityInterval.parser(), - extensionRegistry)); - break; - } - case 129: - { - costPerHour_ = input.readDouble(); - break; - } - case 137: - { - costPerTraveledHour_ = input.readDouble(); - break; - } - case 145: - { - costPerKilometer_ = input.readDouble(); - break; - } - case 153: - { - fixedCost_ = input.readDouble(); - break; - } - case 160: - { - usedIfRouteIsEmpty_ = input.readBool(); - break; - } - case 170: - { - com.google.cloud.optimization.v1.Vehicle.DurationLimit.Builder subBuilder = null; - if (routeDurationLimit_ != null) { - subBuilder = routeDurationLimit_.toBuilder(); - } - routeDurationLimit_ = - input.readMessage( - com.google.cloud.optimization.v1.Vehicle.DurationLimit.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(routeDurationLimit_); - routeDurationLimit_ = subBuilder.buildPartial(); - } - - break; - } - case 178: - { - com.google.cloud.optimization.v1.Vehicle.DurationLimit.Builder subBuilder = null; - if (travelDurationLimit_ != null) { - subBuilder = travelDurationLimit_.toBuilder(); - } - travelDurationLimit_ = - input.readMessage( - com.google.cloud.optimization.v1.Vehicle.DurationLimit.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(travelDurationLimit_); - travelDurationLimit_ = subBuilder.buildPartial(); - } - - break; - } - case 186: - { - com.google.cloud.optimization.v1.DistanceLimit.Builder subBuilder = null; - if (routeDistanceLimit_ != null) { - subBuilder = routeDistanceLimit_.toBuilder(); - } - routeDistanceLimit_ = - input.readMessage( - com.google.cloud.optimization.v1.DistanceLimit.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(routeDistanceLimit_); - routeDistanceLimit_ = subBuilder.buildPartial(); - } - - break; - } - case 194: - { - if (!((mutable_bitField0_ & 0x00000040) != 0)) { - extraVisitDurationForVisitType_ = - com.google.protobuf.MapField.newMapField( - ExtraVisitDurationForVisitTypeDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000040; - } - com.google.protobuf.MapEntry - extraVisitDurationForVisitType__ = - input.readMessage( - ExtraVisitDurationForVisitTypeDefaultEntryHolder.defaultEntry - .getParserForType(), - extensionRegistry); - extraVisitDurationForVisitType_ - .getMutableMap() - .put( - extraVisitDurationForVisitType__.getKey(), - extraVisitDurationForVisitType__.getValue()); - break; - } - case 202: - { - com.google.cloud.optimization.v1.BreakRule.Builder subBuilder = null; - if (breakRule_ != null) { - subBuilder = breakRule_.toBuilder(); - } - breakRule_ = - input.readMessage( - com.google.cloud.optimization.v1.BreakRule.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(breakRule_); - breakRule_ = subBuilder.buildPartial(); - } - - break; - } - case 218: - { - java.lang.String s = input.readStringRequireUtf8(); - - label_ = s; - break; - } - case 224: - { - ignore_ = input.readBool(); - break; - } - case 232: - { - if (!((mutable_bitField0_ & 0x00000080) != 0)) { - breakRuleIndices_ = newIntList(); - mutable_bitField0_ |= 0x00000080; - } - breakRuleIndices_.addInt(input.readInt32()); - break; - } - case 234: - { - int length = input.readRawVarint32(); - int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000080) != 0) && input.getBytesUntilLimit() > 0) { - breakRuleIndices_ = newIntList(); - mutable_bitField0_ |= 0x00000080; - } - while (input.getBytesUntilLimit() > 0) { - breakRuleIndices_.addInt(input.readInt32()); - } - input.popLimit(limit); - break; - } - case 242: - { - if (!((mutable_bitField0_ & 0x00000020) != 0)) { - loadLimits_ = - com.google.protobuf.MapField.newMapField( - LoadLimitsDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000020; - } - com.google.protobuf.MapEntry< - java.lang.String, com.google.cloud.optimization.v1.Vehicle.LoadLimit> - loadLimits__ = - input.readMessage( - LoadLimitsDefaultEntryHolder.defaultEntry.getParserForType(), - extensionRegistry); - loadLimits_.getMutableMap().put(loadLimits__.getKey(), loadLimits__.getValue()); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { - startTags_ = startTags_.getUnmodifiableView(); - } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - endTags_ = endTags_.getUnmodifiableView(); - } - if (((mutable_bitField0_ & 0x00000004) != 0)) { - startTimeWindows_ = java.util.Collections.unmodifiableList(startTimeWindows_); - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - endTimeWindows_ = java.util.Collections.unmodifiableList(endTimeWindows_); - } - if (((mutable_bitField0_ & 0x00000100) != 0)) { - capacities_ = java.util.Collections.unmodifiableList(capacities_); - } - if (((mutable_bitField0_ & 0x00000200) != 0)) { - startLoadIntervals_ = java.util.Collections.unmodifiableList(startLoadIntervals_); - } - if (((mutable_bitField0_ & 0x00000400) != 0)) { - endLoadIntervals_ = java.util.Collections.unmodifiableList(endLoadIntervals_); - } - if (((mutable_bitField0_ & 0x00000080) != 0)) { - breakRuleIndices_.makeImmutable(); // C - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_Vehicle_descriptor; @@ -955,98 +561,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private LoadLimit( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - bitField0_ |= 0x00000001; - maxLoad_ = input.readInt64(); - break; - } - case 16: - { - softMaxLoad_ = input.readInt64(); - break; - } - case 25: - { - costPerUnitAboveSoftMax_ = input.readDouble(); - break; - } - case 34: - { - com.google.cloud.optimization.v1.Vehicle.LoadLimit.Interval.Builder subBuilder = - null; - if (startLoadInterval_ != null) { - subBuilder = startLoadInterval_.toBuilder(); - } - startLoadInterval_ = - input.readMessage( - com.google.cloud.optimization.v1.Vehicle.LoadLimit.Interval.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(startLoadInterval_); - startLoadInterval_ = subBuilder.buildPartial(); - } - - break; - } - case 42: - { - com.google.cloud.optimization.v1.Vehicle.LoadLimit.Interval.Builder subBuilder = - null; - if (endLoadInterval_ != null) { - subBuilder = endLoadInterval_.toBuilder(); - } - endLoadInterval_ = - input.readMessage( - com.google.cloud.optimization.v1.Vehicle.LoadLimit.Interval.parser(), - extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(endLoadInterval_); - endLoadInterval_ = subBuilder.buildPartial(); - } - - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_Vehicle_LoadLimit_descriptor; @@ -1142,58 +656,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Interval( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: - { - min_ = input.readInt64(); - break; - } - case 16: - { - bitField0_ |= 0x00000001; - max_ = input.readInt64(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_Vehicle_LoadLimit_Interval_descriptor; @@ -1286,7 +748,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000001) != 0)) { output.writeInt64(2, max_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1301,7 +763,7 @@ public int getSerializedSize() { if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, max_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1322,7 +784,7 @@ public boolean equals(final java.lang.Object obj) { if (hasMax()) { if (getMax() != other.getMax()) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1339,7 +801,7 @@ public int hashCode() { hash = (37 * hash) + MAX_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getMax()); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1471,17 +933,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.Vehicle.LoadLimit.Interval.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -1587,7 +1042,7 @@ public Builder mergeFrom( if (other.hasMax()) { setMax(other.getMax()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1602,19 +1057,43 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.Vehicle.LoadLimit.Interval parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + min_ = input.readInt64(); + + break; + } // case 8 + case 16: + { + max_ = input.readInt64(); + bitField0_ |= 0x00000001; + break; + } // case 16 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.Vehicle.LoadLimit.Interval) - e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1785,7 +1264,19 @@ public Interval parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Interval(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2008,7 +1499,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (endLoadInterval_ != null) { output.writeMessage(5, getEndLoadInterval()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2033,7 +1524,7 @@ public int getSerializedSize() { if (endLoadInterval_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getEndLoadInterval()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2064,7 +1555,7 @@ public boolean equals(final java.lang.Object obj) { if (hasEndLoadInterval()) { if (!getEndLoadInterval().equals(other.getEndLoadInterval())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2094,7 +1585,7 @@ public int hashCode() { hash = (37 * hash) + END_LOAD_INTERVAL_FIELD_NUMBER; hash = (53 * hash) + getEndLoadInterval().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2226,17 +1717,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.Vehicle.LoadLimit.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -2373,7 +1857,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.Vehicle.LoadLimit othe if (other.hasEndLoadInterval()) { mergeEndLoadInterval(other.getEndLoadInterval()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2388,18 +1872,63 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.Vehicle.LoadLimit parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + maxLoad_ = input.readInt64(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 16: + { + softMaxLoad_ = input.readInt64(); + + break; + } // case 16 + case 25: + { + costPerUnitAboveSoftMax_ = input.readDouble(); + + break; + } // case 25 + case 34: + { + input.readMessage( + getStartLoadIntervalFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + input.readMessage( + getEndLoadIntervalFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.Vehicle.LoadLimit) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3018,7 +2547,19 @@ public LoadLimit parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new LoadLimit(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -3293,103 +2834,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private DurationLimit( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (maxDuration_ != null) { - subBuilder = maxDuration_.toBuilder(); - } - maxDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(maxDuration_); - maxDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 18: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (softMaxDuration_ != null) { - subBuilder = softMaxDuration_.toBuilder(); - } - softMaxDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(softMaxDuration_); - softMaxDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 25: - { - bitField0_ |= 0x00000001; - costPerHourAfterSoftMax_ = input.readDouble(); - break; - } - case 34: - { - com.google.protobuf.Duration.Builder subBuilder = null; - if (quadraticSoftMaxDuration_ != null) { - subBuilder = quadraticSoftMaxDuration_.toBuilder(); - } - quadraticSoftMaxDuration_ = - input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(quadraticSoftMaxDuration_); - quadraticSoftMaxDuration_ = subBuilder.buildPartial(); - } - - break; - } - case 41: - { - bitField0_ |= 0x00000002; - costPerSquareHourAfterQuadraticSoftMax_ = input.readDouble(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_Vehicle_DurationLimit_descriptor; @@ -3706,7 +3150,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (((bitField0_ & 0x00000002) != 0)) { output.writeDouble(5, costPerSquareHourAfterQuadraticSoftMax_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3735,7 +3179,7 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeDoubleSize( 5, costPerSquareHourAfterQuadraticSoftMax_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3776,7 +3220,7 @@ public boolean equals(final java.lang.Object obj) { != java.lang.Double.doubleToLongBits(other.getCostPerSquareHourAfterQuadraticSoftMax())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3813,7 +3257,7 @@ public int hashCode() { + com.google.protobuf.Internal.hashLong( java.lang.Double.doubleToLongBits(getCostPerSquareHourAfterQuadraticSoftMax())); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3948,17 +3392,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.Vehicle.DurationLimit.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override @@ -4107,7 +3544,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.Vehicle.DurationLimit setCostPerSquareHourAfterQuadraticSoftMax( other.getCostPerSquareHourAfterQuadraticSoftMax()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -4122,18 +3559,63 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.Vehicle.DurationLimit parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getMaxDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 10 + case 18: + { + input.readMessage( + getSoftMaxDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 18 + case 25: + { + costPerHourAfterSoftMax_ = input.readDouble(); + bitField0_ |= 0x00000001; + break; + } // case 25 + case 34: + { + input.readMessage( + getQuadraticSoftMaxDurationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 41: + { + costPerSquareHourAfterQuadraticSoftMax_ = input.readDouble(); + bitField0_ |= 0x00000002; + break; + } // case 41 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (com.google.cloud.optimization.v1.Vehicle.DurationLimit) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -5017,7 +4499,19 @@ public DurationLimit parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DurationLimit(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -6881,7 +6375,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetLoadLimits(), LoadLimitsDefaultEntryHolder.defaultEntry, 30); - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -7021,7 +6515,7 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(30, loadLimits__); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -7097,7 +6591,7 @@ public boolean equals(final java.lang.Object obj) { if (!getCapacitiesList().equals(other.getCapacitiesList())) return false; if (!getStartLoadIntervalsList().equals(other.getStartLoadIntervalsList())) return false; if (!getEndLoadIntervalsList().equals(other.getEndLoadIntervalsList())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -7217,7 +6711,7 @@ public int hashCode() { hash = (37 * hash) + END_LOAD_INTERVALS_FIELD_NUMBER; hash = (53 * hash) + getEndLoadIntervalsList().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -7372,23 +6866,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) { } // Construct using com.google.cloud.optimization.v1.Vehicle.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) { - getStartTimeWindowsFieldBuilder(); - getEndTimeWindowsFieldBuilder(); - getCapacitiesFieldBuilder(); - getStartLoadIntervalsFieldBuilder(); - getEndLoadIntervalsFieldBuilder(); - } } @java.lang.Override @@ -7426,16 +6907,18 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000002); if (startTimeWindowsBuilder_ == null) { startTimeWindows_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); } else { + startTimeWindows_ = null; startTimeWindowsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000004); if (endTimeWindowsBuilder_ == null) { endTimeWindows_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); } else { + endTimeWindows_ = null; endTimeWindowsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000008); travelDurationMultiple_ = 0D; bitField0_ = (bitField0_ & ~0x00000010); unloadingPolicy_ = 0; @@ -7484,22 +6967,25 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000080); if (capacitiesBuilder_ == null) { capacities_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000100); } else { + capacities_ = null; capacitiesBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000100); if (startLoadIntervalsBuilder_ == null) { startLoadIntervals_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000200); } else { + startLoadIntervals_ = null; startLoadIntervalsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000200); if (endLoadIntervalsBuilder_ == null) { endLoadIntervals_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000400); } else { + endLoadIntervals_ = null; endLoadIntervalsBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000400); return this; } @@ -7919,7 +7405,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.Vehicle other) { } } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -7934,17 +7420,270 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.Vehicle parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: + { + travelMode_ = input.readEnum(); + + break; + } // case 8 + case 26: + { + input.readMessage(getStartLocationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 26 + case 34: + { + input.readMessage(getStartWaypointFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 34 + case 42: + { + input.readMessage(getEndLocationFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 42 + case 50: + { + input.readMessage(getEndWaypointFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 50 + case 58: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureStartTagsIsMutable(); + startTags_.add(s); + break; + } // case 58 + case 66: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureEndTagsIsMutable(); + endTags_.add(s); + break; + } // case 66 + case 74: + { + com.google.cloud.optimization.v1.TimeWindow m = + input.readMessage( + com.google.cloud.optimization.v1.TimeWindow.parser(), extensionRegistry); + if (startTimeWindowsBuilder_ == null) { + ensureStartTimeWindowsIsMutable(); + startTimeWindows_.add(m); + } else { + startTimeWindowsBuilder_.addMessage(m); + } + break; + } // case 74 + case 82: + { + com.google.cloud.optimization.v1.TimeWindow m = + input.readMessage( + com.google.cloud.optimization.v1.TimeWindow.parser(), extensionRegistry); + if (endTimeWindowsBuilder_ == null) { + ensureEndTimeWindowsIsMutable(); + endTimeWindows_.add(m); + } else { + endTimeWindowsBuilder_.addMessage(m); + } + break; + } // case 82 + case 89: + { + travelDurationMultiple_ = input.readDouble(); + bitField0_ |= 0x00000010; + break; + } // case 89 + case 96: + { + unloadingPolicy_ = input.readEnum(); + + break; + } // case 96 + case 106: + { + com.google.cloud.optimization.v1.CapacityQuantity m = + input.readMessage( + com.google.cloud.optimization.v1.CapacityQuantity.parser(), + extensionRegistry); + if (capacitiesBuilder_ == null) { + ensureCapacitiesIsMutable(); + capacities_.add(m); + } else { + capacitiesBuilder_.addMessage(m); + } + break; + } // case 106 + case 114: + { + com.google.cloud.optimization.v1.CapacityQuantityInterval m = + input.readMessage( + com.google.cloud.optimization.v1.CapacityQuantityInterval.parser(), + extensionRegistry); + if (startLoadIntervalsBuilder_ == null) { + ensureStartLoadIntervalsIsMutable(); + startLoadIntervals_.add(m); + } else { + startLoadIntervalsBuilder_.addMessage(m); + } + break; + } // case 114 + case 122: + { + com.google.cloud.optimization.v1.CapacityQuantityInterval m = + input.readMessage( + com.google.cloud.optimization.v1.CapacityQuantityInterval.parser(), + extensionRegistry); + if (endLoadIntervalsBuilder_ == null) { + ensureEndLoadIntervalsIsMutable(); + endLoadIntervals_.add(m); + } else { + endLoadIntervalsBuilder_.addMessage(m); + } + break; + } // case 122 + case 129: + { + costPerHour_ = input.readDouble(); + + break; + } // case 129 + case 137: + { + costPerTraveledHour_ = input.readDouble(); + + break; + } // case 137 + case 145: + { + costPerKilometer_ = input.readDouble(); + + break; + } // case 145 + case 153: + { + fixedCost_ = input.readDouble(); + + break; + } // case 153 + case 160: + { + usedIfRouteIsEmpty_ = input.readBool(); + + break; + } // case 160 + case 170: + { + input.readMessage( + getRouteDurationLimitFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 170 + case 178: + { + input.readMessage( + getTravelDurationLimitFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 178 + case 186: + { + input.readMessage( + getRouteDistanceLimitFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 186 + case 194: + { + com.google.protobuf.MapEntry + extraVisitDurationForVisitType__ = + input.readMessage( + ExtraVisitDurationForVisitTypeDefaultEntryHolder.defaultEntry + .getParserForType(), + extensionRegistry); + internalGetMutableExtraVisitDurationForVisitType() + .getMutableMap() + .put( + extraVisitDurationForVisitType__.getKey(), + extraVisitDurationForVisitType__.getValue()); + break; + } // case 194 + case 202: + { + input.readMessage(getBreakRuleFieldBuilder().getBuilder(), extensionRegistry); + + break; + } // case 202 + case 218: + { + label_ = input.readStringRequireUtf8(); + + break; + } // case 218 + case 224: + { + ignore_ = input.readBool(); + + break; + } // case 224 + case 232: + { + int v = input.readInt32(); + ensureBreakRuleIndicesIsMutable(); + breakRuleIndices_.addInt(v); + break; + } // case 232 + case 234: + { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + ensureBreakRuleIndicesIsMutable(); + while (input.getBytesUntilLimit() > 0) { + breakRuleIndices_.addInt(input.readInt32()); + } + input.popLimit(limit); + break; + } // case 234 + case 242: + { + com.google.protobuf.MapEntry< + java.lang.String, com.google.cloud.optimization.v1.Vehicle.LoadLimit> + loadLimits__ = + input.readMessage( + LoadLimitsDefaultEntryHolder.defaultEntry.getParserForType(), + extensionRegistry); + internalGetMutableLoadLimits() + .getMutableMap() + .put(loadLimits__.getKey(), loadLimits__.getValue()); + break; + } // case 242 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.Vehicle) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -13742,7 +13481,18 @@ public Vehicle parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Vehicle(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Waypoint.java b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Waypoint.java index de0b987..81b42a8 100644 --- a/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Waypoint.java +++ b/proto-google-cloud-optimization-v1/src/main/java/com/google/cloud/optimization/v1/Waypoint.java @@ -51,74 +51,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() { return this.unknownFields; } - private Waypoint( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - com.google.cloud.optimization.v1.Location.Builder subBuilder = null; - if (locationTypeCase_ == 1) { - subBuilder = - ((com.google.cloud.optimization.v1.Location) locationType_).toBuilder(); - } - locationType_ = - input.readMessage( - com.google.cloud.optimization.v1.Location.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.google.cloud.optimization.v1.Location) locationType_); - locationType_ = subBuilder.buildPartial(); - } - locationTypeCase_ = 1; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - locationTypeCase_ = 2; - locationType_ = s; - break; - } - case 24: - { - sideOfRoad_ = input.readBool(); - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.google.cloud.optimization.v1.FleetRoutingProto .internal_static_google_cloud_optimization_v1_Waypoint_descriptor; @@ -351,7 +283,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (sideOfRoad_ != false) { output.writeBool(3, sideOfRoad_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -371,7 +303,7 @@ public int getSerializedSize() { if (sideOfRoad_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, sideOfRoad_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -399,7 +331,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -424,7 +356,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -554,22 +486,18 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using com.google.cloud.optimization.v1.Waypoint.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } + private Builder() {} private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } @java.lang.Override public Builder clear() { super.clear(); + if (locationBuilder_ != null) { + locationBuilder_.clear(); + } sideOfRoad_ = false; locationTypeCase_ = 0; @@ -683,7 +611,7 @@ public Builder mergeFrom(com.google.cloud.optimization.v1.Waypoint other) { break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -698,17 +626,50 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.google.cloud.optimization.v1.Waypoint parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + input.readMessage(getLocationFieldBuilder().getBuilder(), extensionRegistry); + locationTypeCase_ = 1; + break; + } // case 10 + case 18: + { + java.lang.String s = input.readStringRequireUtf8(); + locationTypeCase_ = 2; + locationType_ = s; + break; + } // case 18 + case 24: + { + sideOfRoad_ = input.readBool(); + + break; + } // case 24 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.google.cloud.optimization.v1.Waypoint) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1177,7 +1138,18 @@ public Waypoint parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Waypoint(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 11f3cf6..3bc908f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-optimization - 1.1.12 + 1.1.13 diff --git a/versions.txt b/versions.txt index 6b284e2..ba0fca3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-optimization:1.1.12:1.1.12 -proto-google-cloud-optimization-v1:1.1.12:1.1.12 -grpc-google-cloud-optimization-v1:1.1.12:1.1.12 +google-cloud-optimization:1.1.13:1.1.13 +proto-google-cloud-optimization-v1:1.1.13:1.1.13 +grpc-google-cloud-optimization-v1:1.1.13:1.1.13