Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

deps: regenerating with new Protobuf (2.1.x) #801

Merged
merged 2 commits into from
Oct 13, 2022
Merged

deps: regenerating with new Protobuf (2.1.x) #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e354179
fix: applying a different code generation
suztomo Oct 12, 2022
1878202
deps: shared deps 2.10.1
suztomo Oct 12, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>2.10.0</version>
<version>2.10.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
202 changes: 85 additions & 117 deletions ...o-google-cloud-tasks-v2/src/main/java/com/google/cloud/tasks/v2/AppEngineHttpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,93 +102,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
return this.unknownFields;
}

private AppEngineHttpRequest(
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();

httpMethod_ = rawValue;
break;
}
case 18:
{
com.google.cloud.tasks.v2.AppEngineRouting.Builder subBuilder = null;
if (appEngineRouting_ != null) {
subBuilder = appEngineRouting_.toBuilder();
}
appEngineRouting_ =
input.readMessage(
com.google.cloud.tasks.v2.AppEngineRouting.parser(), extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(appEngineRouting_);
appEngineRouting_ = subBuilder.buildPartial();
}

break;
}
case 26:
{
java.lang.String s = input.readStringRequireUtf8();

relativeUri_ = s;
break;
}
case 34:
{
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
headers_ =
com.google.protobuf.MapField.newMapField(
HeadersDefaultEntryHolder.defaultEntry);
mutable_bitField0_ |= 0x00000001;
}
com.google.protobuf.MapEntry<java.lang.String, java.lang.String> headers__ =
input.readMessage(
HeadersDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
headers_.getMutableMap().put(headers__.getKey(), headers__.getValue());
break;
}
case 42:
{
body_ = input.readBytes();
break;
}
default:
{
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
throw e.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.tasks.v2.TargetProto
.internal_static_google_cloud_tasks_v2_AppEngineHttpRequest_descriptor;
Expand Down Expand Up @@ -455,7 +368,7 @@ public int getHeadersCount() {
@java.lang.Override
public boolean containsHeaders(java.lang.String key) {
if (key == null) {
throw new java.lang.NullPointerException();
throw new NullPointerException("map key");
}
return internalGetHeaders().getMap().containsKey(key);
}
Expand Down Expand Up @@ -554,7 +467,7 @@ public java.util.Map<java.lang.String, java.lang.String> getHeadersMap() {
@java.lang.Override
public java.lang.String getHeadersOrDefault(java.lang.String key, java.lang.String defaultValue) {
if (key == null) {
throw new java.lang.NullPointerException();
throw new NullPointerException("map key");
}
java.util.Map<java.lang.String, java.lang.String> map = internalGetHeaders().getMap();
return map.containsKey(key) ? map.get(key) : defaultValue;
Expand Down Expand Up @@ -603,7 +516,7 @@ public java.lang.String getHeadersOrDefault(java.lang.String key, java.lang.Stri
@java.lang.Override
public java.lang.String getHeadersOrThrow(java.lang.String key) {
if (key == null) {
throw new java.lang.NullPointerException();
throw new NullPointerException("map key");
}
java.util.Map<java.lang.String, java.lang.String> map = internalGetHeaders().getMap();
if (!map.containsKey(key)) {
Expand Down Expand Up @@ -660,7 +573,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!body_.isEmpty()) {
output.writeBytes(5, body_);
}
unknownFields.writeTo(output);
getUnknownFields().writeTo(output);
}

@java.lang.Override
Expand Down Expand Up @@ -691,7 +604,7 @@ public int getSerializedSize() {
if (!body_.isEmpty()) {
size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, body_);
}
size += unknownFields.getSerializedSize();
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
}
Expand All @@ -715,7 +628,7 @@ public boolean equals(final java.lang.Object obj) {
if (!getRelativeUri().equals(other.getRelativeUri())) return false;
if (!internalGetHeaders().equals(other.internalGetHeaders())) return false;
if (!getBody().equals(other.getBody())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}

Expand All @@ -740,7 +653,7 @@ public int hashCode() {
}
hash = (37 * hash) + BODY_FIELD_NUMBER;
hash = (53 * hash) + getBody().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
}
Expand Down Expand Up @@ -937,17 +850,10 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
}

// Construct using com.google.cloud.tasks.v2.AppEngineHttpRequest.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
Expand Down Expand Up @@ -1067,7 +973,7 @@ public Builder mergeFrom(com.google.cloud.tasks.v2.AppEngineHttpRequest other) {
if (other.getBody() != com.google.protobuf.ByteString.EMPTY) {
setBody(other.getBody());
}
this.mergeUnknownFields(other.unknownFields);
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
}
Expand All @@ -1082,17 +988,67 @@ public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.cloud.tasks.v2.AppEngineHttpRequest 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:
{
httpMethod_ = input.readEnum();

break;
} // case 8
case 18:
{
input.readMessage(
getAppEngineRoutingFieldBuilder().getBuilder(), extensionRegistry);

break;
} // case 18
case 26:
{
relativeUri_ = input.readStringRequireUtf8();

break;
} // case 26
case 34:
{
com.google.protobuf.MapEntry<java.lang.String, java.lang.String> headers__ =
input.readMessage(
HeadersDefaultEntryHolder.defaultEntry.getParserForType(),
extensionRegistry);
internalGetMutableHeaders()
.getMutableMap()
.put(headers__.getKey(), headers__.getValue());
break;
} // case 34
case 42:
{
body_ = input.readBytes();

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.tasks.v2.AppEngineHttpRequest) e.getUnfinishedMessage();
throw e.unwrapIOException();
} finally {
if (parsedMessage != null) {
mergeFrom(parsedMessage);
}
}
onChanged();
} // finally
return this;
}

Expand Down Expand Up @@ -1651,7 +1607,7 @@ public int getHeadersCount() {
@java.lang.Override
public boolean containsHeaders(java.lang.String key) {
if (key == null) {
throw new java.lang.NullPointerException();
throw new NullPointerException("map key");
}
return internalGetHeaders().getMap().containsKey(key);
}
Expand Down Expand Up @@ -1751,7 +1707,7 @@ public java.util.Map<java.lang.String, java.lang.String> getHeadersMap() {
public java.lang.String getHeadersOrDefault(
java.lang.String key, java.lang.String defaultValue) {
if (key == null) {
throw new java.lang.NullPointerException();
throw new NullPointerException("map key");
}
java.util.Map<java.lang.String, java.lang.String> map = internalGetHeaders().getMap();
return map.containsKey(key) ? map.get(key) : defaultValue;
Expand Down Expand Up @@ -1800,7 +1756,7 @@ public java.lang.String getHeadersOrDefault(
@java.lang.Override
public java.lang.String getHeadersOrThrow(java.lang.String key) {
if (key == null) {
throw new java.lang.NullPointerException();
throw new NullPointerException("map key");
}
java.util.Map<java.lang.String, java.lang.String> map = internalGetHeaders().getMap();
if (!map.containsKey(key)) {
Expand Down Expand Up @@ -1856,7 +1812,7 @@ public Builder clearHeaders() {
*/
public Builder removeHeaders(java.lang.String key) {
if (key == null) {
throw new java.lang.NullPointerException();
throw new NullPointerException("map key");
}
internalGetMutableHeaders().getMutableMap().remove(key);
return this;
Expand Down Expand Up @@ -1909,11 +1865,12 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableHeaders() {
*/
public Builder putHeaders(java.lang.String key, java.lang.String value) {
if (key == null) {
throw new java.lang.NullPointerException();
throw new NullPointerException("map key");
}
if (value == null) {
throw new java.lang.NullPointerException();
throw new NullPointerException("map value");
}

internalGetMutableHeaders().getMutableMap().put(key, value);
return this;
}
Expand Down Expand Up @@ -2056,7 +2013,18 @@ public AppEngineHttpRequest parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return new AppEngineHttpRequest(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();
}
};

Expand Down
Loading