Skip to content

[ggj][resnames] fix: handle wildcard-only resource_reference #479

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 10 commits into from
Nov 12, 2020
Merged

[ggj][resnames] fix: handle wildcard-only resource_reference #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0725750
fix: swap assertEquals args in JavaWriterVisitorTest to match (expect…
miraleung Nov 7, 2020
67f3a15
fix: swap assertEquals args in ImportWriterVisitorTest to match (expe…
miraleung Nov 7, 2020
1e1a86b
fix: add node validator to refactor/centralize null element checks
miraleung Nov 7, 2020
0a6662c
test: update logging integration goldens with gapic.yaml
miraleung Nov 10, 2020
e9cdf58
feat!: remove gapic.yaml from Bazel and input interface
miraleung Nov 10, 2020
827049d
feat!: remove all per-RPC batching codegen logic
miraleung Nov 10, 2020
ea153c5
fix: update tests
miraleung Nov 10, 2020
7f15ea5
Merge branch 'gp/g1' of github.com:googleapis/gapic-generator-java in…
miraleung Nov 10, 2020
0722246
fix: handle wildcard-only resource_reference
miraleung Nov 11, 2020
364a3e8
Merge branch 'master' into gp/g3-test-iam
miraleung Nov 12, 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
5 changes: 5 additions & 0 deletions src/main/java/com/google/api/generator/gapic/model/ResourceReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

package com.google.api.generator.gapic.model;

import com.google.api.generator.gapic.utils.ResourceNameConstants;
import com.google.auto.value.AutoValue;

@AutoValue
Expand All @@ -23,6 +24,10 @@ public abstract class ResourceReference {

public abstract boolean isChildType();

public boolean isOnlyWildcard() {
return resourceTypeString().equals(ResourceNameConstants.WILDCARD_PATTERN);
}

public static ResourceReference withType(String resourceTypeString) {
return builder().setResourceTypeString(resourceTypeString).setIsChildType(false).build();
}
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/com/google/api/generator/gapic/protoparser/ResourceReferenceParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,14 @@ public static List<ResourceName> parseResourceNames(
@Nullable String description,
Map<String, ResourceName> resourceNames,
Map<String, ResourceName> patternsToResourceNames) {
ResourceName resourceName = resourceNames.get(resourceReference.resourceTypeString());
ResourceName resourceName = null;
if (resourceReference.isOnlyWildcard()) {
resourceName = ResourceName.createWildcard("*", "com.google.api.wildcard.placeholder");
resourceNames.put(resourceName.resourceTypeString(), resourceName);
} else {
resourceName = resourceNames.get(resourceReference.resourceTypeString());
}
resourceName = resourceNames.get(resourceReference.resourceTypeString());
Preconditions.checkNotNull(
resourceName,
String.format(
Expand Down