Skip to content

[ggj][codegen] fix: add ByteString to DefaultValueComposer #404

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

Merged
miraleung merged 9 commits into from
Oct 24, 2020
Merged

[ggj][codegen] fix: add ByteString to DefaultValueComposer #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ceaaddb
fix: refactor requestBuilder into separate method in ServiceClientCla…
miraleung Oct 7, 2020
fba69cb
Merge branch 'master' of github.com:googleapis/gapic-generator-java i…
miraleung Oct 8, 2020
32672f2
fix: merge master
miraleung Oct 21, 2020
bdcb62e
feat: add varargs to AnonClass and ref setter methods
miraleung Oct 21, 2020
e15e115
feat: add HTTP annotation parsing/validation
miraleung Oct 21, 2020
28d3b3c
feat: Generate RequestParamsExtractor in GrpcServiceStub
miraleung Oct 21, 2020
5293551
feat: add GrpcPublisherStub test to exercise HTTP subfields
miraleung Oct 21, 2020
2a50453
fix: add ByteString to DefaultValueComposer
miraleung Oct 21, 2020
27b17d3
Merge branch 'master' into gp/g4
miraleung Oct 24, 2020
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
11 changes: 11 additions & 0 deletions src/main/java/com/google/api/generator/gapic/composer/DefaultValueComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.google.api.generator.engine.ast.StringObjectValue;
import com.google.api.generator.engine.ast.TypeNode;
import com.google.api.generator.engine.ast.ValueExpr;
import com.google.api.generator.engine.ast.Variable;
import com.google.api.generator.engine.ast.VariableExpr;
import com.google.api.generator.gapic.model.Field;
import com.google.api.generator.gapic.model.Message;
Expand All @@ -32,6 +33,7 @@
import com.google.common.base.Preconditions;
import com.google.longrunning.Operation;
import com.google.protobuf.Any;
import com.google.protobuf.ByteString;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
Expand All @@ -44,6 +46,8 @@ public class DefaultValueComposer {
private static TypeNode OPERATION_TYPE =
TypeNode.withReference(ConcreteReference.withClazz(Operation.class));
private static TypeNode ANY_TYPE = TypeNode.withReference(ConcreteReference.withClazz(Any.class));
private static TypeNode BYTESTRING_TYPE =
TypeNode.withReference(ConcreteReference.withClazz(ByteString.class));

static Expr createDefaultValue(
MethodArgument methodArg, Map<String, ResourceName> resourceNames) {
Expand Down Expand Up @@ -122,6 +126,13 @@ static Expr createDefaultValue(Field f) {
PrimitiveValue.builder().setType(f.type()).setValue("true").build());
}

if (f.type().equals(BYTESTRING_TYPE)) {
return VariableExpr.builder()
.setStaticReferenceType(BYTESTRING_TYPE)
.setVariable(Variable.builder().setName("EMPTY").setType(BYTESTRING_TYPE).build())
.build();
}

throw new UnsupportedOperationException(
String.format(
"Default value for field %s with type %s not implemented yet.", f.name(), f.type()));
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/google/api/generator/gapic/composer/DefaultValueComposerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertThrows;

import com.google.api.generator.engine.ast.ConcreteReference;
import com.google.api.generator.engine.ast.Expr;
import com.google.api.generator.engine.ast.TypeNode;
import com.google.api.generator.engine.writer.JavaWriterVisitor;
import com.google.api.generator.gapic.model.Field;
import com.google.api.generator.gapic.model.Message;
import com.google.api.generator.gapic.model.ResourceName;
import com.google.api.generator.gapic.protoparser.Parser;
import com.google.protobuf.ByteString;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.showcase.v1beta1.EchoOuterClass;
import com.google.testgapic.v1beta1.LockerProto;
Expand Down Expand Up @@ -129,6 +131,18 @@ public void defaultValue_booleanField() {
assertEquals("true", writerVisitor.write());
}

@Test
public void defaultValue_byteStringField() {
Field field =
Field.builder()
.setName("foobar")
.setType(TypeNode.withReference(ConcreteReference.withClazz(ByteString.class)))
.build();
Expr expr = DefaultValueComposer.createDefaultValue(field);
expr.accept(writerVisitor);
assertEquals("ByteString.EMPTY", writerVisitor.write());
}

@Test
public void defaultValue_resourceNameWithOnePattern() {
FileDescriptor lockerServiceFileDescriptor = LockerProto.getDescriptor();
Expand Down