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.

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

[ggj][codegen] fix: fix method arg resname mappings, add logging test #411

Merged
merged 16 commits into from
Oct 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public boolean hasResourceReference() {
return type().equals(TypeNode.STRING) && resourceReference() != null;
}

abstract Builder toBuilder();
public abstract Builder toBuilder();

public static Builder builder() {
return new AutoValue_Field.Builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.api.generator.gapic.model.Message;
import com.google.api.generator.gapic.model.MethodArgument;
import com.google.api.generator.gapic.model.ResourceName;
import com.google.api.generator.gapic.model.ResourceReference;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
Expand Down Expand Up @@ -200,7 +201,41 @@ private static Map<TypeNode, Field> parseTypeFromArgumentName(
outputArgResourceNames.addAll(resourceNameArgs);
typeToField.put(TypeNode.STRING, field);
typeToField.putAll(
resourceNameArgs.stream().collect(Collectors.toMap(r -> r.type(), r -> field)));
resourceNameArgs.stream()
.collect(
Collectors.toMap(
r -> r.type(),
r ->
// Contruct a new field using the parent resource.
field
.toBuilder()
.setResourceReference(
ResourceReference.withType(r.resourceTypeString()))
.build())));
// Only resource name helpers should have more than one entry.
if (typeToField.size() > 1) {
typeToField.entrySet().stream()
.forEach(
e -> {
// Skip string-only variants or ResourceName generics.
if (e.getKey().equals(TypeNode.STRING)
|| e.getKey().reference().name().equals("ResourceName")) {
return;
}
String resourceJavaTypeName = e.getKey().reference().name();
String resourceTypeName = e.getValue().resourceReference().resourceTypeString();
int indexOfSlash = resourceTypeName.indexOf("/");
// We assume that the corresponding Java resource name helper type (i.e. the key)
// ends in *Name. Check that it matches the expeced resource name type.
Preconditions.checkState(
resourceJavaTypeName
.substring(0, resourceJavaTypeName.length() - 4)
.equals(resourceTypeName.substring(indexOfSlash + 1)),
String.format(
"Resource Java type %s does not correspond to proto type %s",
resourceJavaTypeName, resourceTypeName));
});
}
return typeToField;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,18 @@
import com.google.api.generator.gapic.model.Service;
import com.google.api.generator.gapic.protoparser.Parser;
import com.google.api.generator.test.framework.Utils;
import com.google.logging.v2.LogEntryProto;
import com.google.logging.v2.LoggingConfigProto;
import com.google.logging.v2.LoggingMetricsProto;
import com.google.logging.v2.LoggingProto;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Descriptors.ServiceDescriptor;
import com.google.pubsub.v1.PubsubProto;
import com.google.showcase.v1beta1.EchoOuterClass;
import google.cloud.CommonResources;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
Expand Down Expand Up @@ -95,4 +100,46 @@ public void generateClientTest_pubSubPublisherClient() {
Paths.get(ComposerConstants.GOLDENFILES_DIRECTORY, "SubscriberClientTest.golden");
assertCodeEquals(goldenFilePath, visitor.write());
}

@Test
public void generateClientTest_logging() {
FileDescriptor serviceFileDescriptor = LoggingProto.getDescriptor();
ServiceDescriptor serviceDescriptor = serviceFileDescriptor.getServices().get(0);
assertEquals(serviceDescriptor.getName(), "LoggingServiceV2");

List<FileDescriptor> protoFiles =
Arrays.asList(
serviceFileDescriptor,
LogEntryProto.getDescriptor(),
LoggingConfigProto.getDescriptor(),
LoggingMetricsProto.getDescriptor());

Map<String, ResourceName> resourceNames = new HashMap<>();
Map<String, Message> messageTypes = new HashMap<>();
for (FileDescriptor fileDescriptor : protoFiles) {
resourceNames.putAll(Parser.parseResourceNames(fileDescriptor));
messageTypes.putAll(Parser.parseMessages(fileDescriptor));
}

// Additional resource names.
FileDescriptor commonResourcesFileDescriptor = CommonResources.getDescriptor();
resourceNames.putAll(Parser.parseResourceNames(commonResourcesFileDescriptor));

Set<ResourceName> outputResourceNames = new HashSet<>();
List<Service> services =
Parser.parseService(
serviceFileDescriptor, messageTypes, resourceNames, outputResourceNames);

Service loggingService = services.get(0);
GapicClass clazz =
ServiceClientTestClassComposer.instance()
.generate(loggingService, resourceNames, messageTypes);

JavaWriterVisitor visitor = new JavaWriterVisitor();
clazz.classDefinition().accept(visitor);
Utils.saveCodegenToFile(this.getClass(), "LoggingClientTest.golden", visitor.write());
Path goldenFilePath =
Paths.get(ComposerConstants.GOLDENFILES_DIRECTORY, "LoggingClientTest.golden");
assertCodeEquals(goldenFilePath, visitor.write());
}
}
Loading