Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add optional info for google.proto types #6153

Merged
merged 16 commits into from
Mar 13, 2025
+70 −24
Merged

Add optional info for google.proto types #6153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
41dc06f
Add optional info for google.proto types
khj68 Mar 11, 2025
c863988
fix lint error
khj68 Mar 11, 2025
22bbc07
fix test
khj68 Mar 11, 2025
68fb08c
change name of function
khj68 Mar 11, 2025
32fa834
add optional condition
khj68 Mar 11, 2025
63924ef
feat: change to check required behavior
khj68 Mar 11, 2025
80f212b
fix: lint
khj68 Mar 11, 2025
da2d4f2
fix: test
khj68 Mar 11, 2025
dd4cc09
fix: noSuchMethod Error
khj68 Mar 11, 2025
4c997bb
fix: hasField error
khj68 Mar 12, 2025
7740c9e
fix: lint
khj68 Mar 12, 2025
daa55b8
fix: protobuf4 error
khj68 Mar 12, 2025
6334464
feat: add test case
khj68 Mar 12, 2025
ac1ec53
feat: adopt required check to other java types
khj68 Mar 12, 2025
1997946
fix: rollback space
khj68 Mar 12, 2025
a024ee4
Merge branch 'main' into fix_grpc_doc_field_error
khj68 Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions grpc/src/main/java/com/linecorp/armeria/internal/server/grpc/GrpcDocServicePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,10 @@ private static ServiceInfo buildHttpServiceInfo(String serviceName,
builder = FieldInfo.builder(paramName, toTypeSignature(parameter));
}

fieldInfosBuilder.add(builder.requirement(FieldRequirement.REQUIRED)
.location(fieldLocation)
builder.requirement(parameter.isRequired() ? FieldRequirement.REQUIRED
: FieldRequirement.OPTIONAL);

fieldInfosBuilder.add(builder.location(fieldLocation)
.build());
}
});
Expand Down
8 changes: 7 additions & 1 deletion grpc/src/main/java/com/linecorp/armeria/internal/server/grpc/HttpEndpointSpecification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,12 @@ public String toString() {
public static class Parameter {
private final JavaType type;
private final boolean isRepeated;
private final boolean isRequired;

public Parameter(JavaType type, boolean isRepeated) {
public Parameter(JavaType type, boolean isRepeated, boolean isRequired) {
this.type = requireNonNull(type, "type");
this.isRepeated = isRepeated;
this.isRequired = isRequired;
}

public JavaType type() {
Expand All @@ -194,6 +196,10 @@ public boolean isRepeated() {
return isRepeated;
}

public boolean isRequired() {
return isRequired;
}

@Override
public boolean equals(Object o) {
if (this == o) {
Expand Down
61 changes: 46 additions & 15 deletions grpc/src/main/java/com/linecorp/armeria/server/grpc/HttpJsonTranscodingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.api.AnnotationsProto;
import com.google.api.FieldBehavior;
import com.google.api.FieldBehaviorProto;
import com.google.api.HttpBody;
import com.google.api.HttpRule;
import com.google.common.annotations.VisibleForTesting;
Expand All @@ -57,6 +59,7 @@
import com.google.protobuf.Any;
import com.google.protobuf.BoolValue;
import com.google.protobuf.BytesValue;
import com.google.protobuf.DescriptorProtos;
import com.google.protobuf.DescriptorProtos.MethodOptions;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Descriptors.Descriptor;
Expand Down Expand Up @@ -328,7 +331,7 @@ private static Map<String, Field> buildFields(Descriptor desc,
final ImmutableMap.Builder<String, Field> builder = ImmutableMap.builder();
for (FieldDescriptor field : desc.getFields()) {
final JavaType type = field.getJavaType();

final boolean isRequired = hasRequiredFieldBehavior(field);
final String fieldName;
switch (currentMatchRule) {
case ORIGINAL_FIELD:
Expand Down Expand Up @@ -368,13 +371,14 @@ private static Map<String, Field> buildFields(Descriptor desc,
case BYTE_STRING:
case ENUM:
// Use field name which is specified in proto file.
builder.put(key, new Field(field, parentNames, field.getJavaType()));
builder.put(key, new Field(field, parentNames, field.getJavaType(), isRequired));
break;
case MESSAGE:
@Nullable
final JavaType wellKnownFieldType = getJavaTypeForWellKnownTypes(field);

if (wellKnownFieldType != null) {
builder.put(key, new Field(field, parentNames, wellKnownFieldType));
builder.put(key, new Field(field, parentNames, wellKnownFieldType, isRequired));
break;
}

Expand Down Expand Up @@ -408,7 +412,7 @@ private static Map<String, Field> buildFields(Descriptor desc,
throw e;
}

builder.put(key, new Field(field, parentNames, JavaType.MESSAGE));
builder.put(key, new Field(field, parentNames, JavaType.MESSAGE, isRequired));
}
break;
}
Expand All @@ -418,6 +422,18 @@ private static Map<String, Field> buildFields(Descriptor desc,
return builder.buildKeepingLast();
}

private static boolean hasRequiredFieldBehavior(FieldDescriptor field) {
if (field.isRepeated()) {
return false;
}

final List<FieldBehavior> fieldBehaviors = field
.getOptions()
.getExtension((ExtensionLite<DescriptorProtos.FieldOptions, List<FieldBehavior>>)
FieldBehaviorProto.fieldBehavior);
return fieldBehaviors.contains(FieldBehavior.REQUIRED);
}

@Nullable
private static JavaType getJavaTypeForWellKnownTypes(FieldDescriptor fd) {
// MapField can be sent only via HTTP body.
Expand All @@ -434,15 +450,7 @@ private static JavaType getJavaTypeForWellKnownTypes(FieldDescriptor fd) {
return JavaType.STRING;
}

if (DoubleValue.getDescriptor().getFullName().equals(fullName) ||
FloatValue.getDescriptor().getFullName().equals(fullName) ||
Int64Value.getDescriptor().getFullName().equals(fullName) ||
UInt64Value.getDescriptor().getFullName().equals(fullName) ||
Int32Value.getDescriptor().getFullName().equals(fullName) ||
UInt32Value.getDescriptor().getFullName().equals(fullName) ||
BoolValue.getDescriptor().getFullName().equals(fullName) ||
StringValue.getDescriptor().getFullName().equals(fullName) ||
BytesValue.getDescriptor().getFullName().equals(fullName)) {
if (isScalarValueWrapperMessage(fullName)) {
// "value" field. Wrappers must have one field.
assert messageType.getFields().size() == 1 : "Wrappers must have one 'value' field.";
return messageType.getFields().get(0).getJavaType();
Expand All @@ -469,6 +477,18 @@ private static JavaType getJavaTypeForWellKnownTypes(FieldDescriptor fd) {
return null;
}

private static boolean isScalarValueWrapperMessage(String fullName) {
return DoubleValue.getDescriptor().getFullName().equals(fullName) ||
FloatValue.getDescriptor().getFullName().equals(fullName) ||
Int64Value.getDescriptor().getFullName().equals(fullName) ||
UInt64Value.getDescriptor().getFullName().equals(fullName) ||
Int32Value.getDescriptor().getFullName().equals(fullName) ||
UInt32Value.getDescriptor().getFullName().equals(fullName) ||
BoolValue.getDescriptor().getFullName().equals(fullName) ||
StringValue.getDescriptor().getFullName().equals(fullName) ||
BytesValue.getDescriptor().getFullName().equals(fullName);
}

// to make it more efficient, we calculate whether extract response body one time
// if there is no matching toplevel field, we set it to null
@Nullable
Expand Down Expand Up @@ -606,7 +626,8 @@ public HttpEndpointSpecification httpEndpointSpecification(Route route) {
spec.originalFields.entrySet().stream().collect(
toImmutableMap(Entry::getKey,
fieldEntry -> new Parameter(fieldEntry.getValue().type(),
fieldEntry.getValue().isRepeated())));
fieldEntry.getValue().isRepeated(),
fieldEntry.getValue().isRequired())));
return new HttpEndpointSpecification(spec.order,
route,
paramNames,
Expand Down Expand Up @@ -981,11 +1002,17 @@ static final class Field {
private final FieldDescriptor descriptor;
private final List<String> parentNames;
private final JavaType javaType;
private final boolean isRequired;

private Field(FieldDescriptor descriptor, List<String> parentNames, JavaType javaType) {
private Field(FieldDescriptor descriptor,
List<String> parentNames,
JavaType javaType,
boolean isRequired
) {
this.descriptor = descriptor;
this.parentNames = parentNames;
this.javaType = javaType;
this.isRequired = isRequired;
}

JavaType type() {
Expand All @@ -999,6 +1026,10 @@ String name() {
boolean isRepeated() {
return descriptor.isRepeated();
}

boolean isRequired() {
return isRequired;
}
}

/**
Expand Down
16 changes: 10 additions & 6 deletions grpc/src/test/java/com/linecorp/armeria/internal/server/grpc/GrpcDocServicePluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,11 @@ void httpEndpoint() {
FieldInfo.builder("message_id", TypeSignature.ofBase(JavaType.STRING.name()))
.location(FieldLocation.PATH).requirement(FieldRequirement.REQUIRED).build(),
FieldInfo.builder("revision", TypeSignature.ofBase(JavaType.LONG.name()))
.location(FieldLocation.QUERY).requirement(FieldRequirement.REQUIRED).build(),
.location(FieldLocation.QUERY).requirement(FieldRequirement.OPTIONAL).build(),
FieldInfo.builder("sub.subfield", TypeSignature.ofBase(JavaType.STRING.name()))
.location(FieldLocation.QUERY).requirement(FieldRequirement.REQUIRED).build(),
.location(FieldLocation.QUERY).requirement(FieldRequirement.OPTIONAL).build(),
FieldInfo.builder("type", TypeSignature.ofBase(JavaType.ENUM.name()))
.location(FieldLocation.QUERY).requirement(FieldRequirement.REQUIRED).build()));
.location(FieldLocation.QUERY).requirement(FieldRequirement.OPTIONAL).build()));
assertThat(getMessageV2.useParameterAsRoot()).isFalse();

final MethodInfo getMessageV3 = serviceInfo.methods().stream()
Expand All @@ -422,7 +422,7 @@ void httpEndpoint() {
.location(FieldLocation.PATH).requirement(FieldRequirement.REQUIRED).build(),
FieldInfo.builder("revision",
TypeSignature.ofList(TypeSignature.ofBase(JavaType.LONG.name())))
.location(FieldLocation.QUERY).requirement(FieldRequirement.REQUIRED).build()));
.location(FieldLocation.QUERY).requirement(FieldRequirement.OPTIONAL).build()));
assertThat(getMessageV3.useParameterAsRoot()).isFalse();

// Check HTTP PATCH method.
Expand All @@ -437,7 +437,7 @@ void httpEndpoint() {
FieldInfo.builder("message_id", TypeSignature.ofBase(JavaType.STRING.name()))
.location(FieldLocation.PATH).requirement(FieldRequirement.REQUIRED).build(),
FieldInfo.builder("text", TypeSignature.ofBase(JavaType.STRING.name()))
.location(FieldLocation.BODY).requirement(FieldRequirement.REQUIRED).build()));
.location(FieldLocation.BODY).requirement(FieldRequirement.OPTIONAL).build()));
assertThat(updateMessageV1.useParameterAsRoot()).isFalse();

final MethodInfo updateMessageV2 = serviceInfo.methods().stream()
Expand All @@ -451,7 +451,11 @@ void httpEndpoint() {
FieldInfo.builder("message_id", TypeSignature.ofBase(JavaType.STRING.name()))
.location(FieldLocation.PATH).requirement(FieldRequirement.REQUIRED).build(),
FieldInfo.builder("text", TypeSignature.ofBase(JavaType.STRING.name()))
.location(FieldLocation.BODY).requirement(FieldRequirement.REQUIRED).build()));
.location(FieldLocation.BODY).requirement(FieldRequirement.OPTIONAL).build(),
FieldInfo.builder("required_text", TypeSignature.ofBase(JavaType.STRING.name()))
.location(FieldLocation.BODY).requirement(FieldRequirement.REQUIRED).build(),
FieldInfo.builder("optional_text", TypeSignature.ofBase(JavaType.STRING.name()))
.location(FieldLocation.BODY).requirement(FieldRequirement.OPTIONAL).build()));
assertThat(updateMessageV2.useParameterAsRoot()).isFalse();
}

Expand Down
3 changes: 3 additions & 0 deletions grpc/src/test/proto/testing/grpc/transcoding.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ package armeria.grpc.testing;
option java_package = "testing.grpc";

import "google/api/annotations.proto";
import "google/api/field_behavior.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/wrappers.proto";
Expand Down Expand Up @@ -292,6 +293,8 @@ message UpdateMessageRequestV1 {

message Message {
string text = 1; // The resource content.
google.protobuf.StringValue required_text = 2 [(google.api.field_behavior) = REQUIRED];
google.protobuf.StringValue optional_text = 3;
}

enum MessageType {
Expand Down
Loading