Skip to content

Commit

Permalink
fix: Routing annotation was not recognized on parsing protos (#928)
Browse files Browse the repository at this point in the history
Routing annotation was not recognized on parsing protos, this is due to RoutingProto's extensions are not registered. This also indicate that we are missing integration tests for the new routing annotation, hence added bigtable to integration tests as well.
  • Loading branch information
blakeli0 authored Feb 11, 2022
1 parent 0940f46 commit 2ce9f42
Show file tree
Hide file tree
Showing 28 changed files with 4,563 additions and 19 deletions.
4 changes: 2 additions & 2 deletions repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ def gapic_generator_java_repositories():
_maybe(
http_archive,
name = "com_google_googleapis",
strip_prefix = "googleapis-0899ba0f4c053a4487ccf0b699df5f850e39a45f",
strip_prefix = "googleapis-44d6bef0ca6db8bba3fb324c8186e694bcc4829c",
urls = [
"https://github.com/googleapis/googleapis/archive/0899ba0f4c053a4487ccf0b699df5f850e39a45f.zip",
"https://github.com/googleapis/googleapis/archive/44d6bef0ca6db8bba3fb324c8186e694bcc4829c.zip",
],
)

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/google/api/generator/ProtoRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.google.api.ClientProto;
import com.google.api.FieldBehaviorProto;
import com.google.api.ResourceProto;
import com.google.api.RoutingProto;
import com.google.cloud.ExtendedOperationsProto;
import com.google.longrunning.OperationsProto;
import com.google.protobuf.ExtensionRegistry;
Expand All @@ -31,5 +32,6 @@ public static void registerAllExtensions(ExtensionRegistry extensionRegistry) {
ResourceProto.registerAllExtensions(extensionRegistry);
FieldBehaviorProto.registerAllExtensions(extensionRegistry);
ExtendedOperationsProto.registerAllExtensions(extensionRegistry);
RoutingProto.registerAllExtensions(extensionRegistry);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public class SubscriberClientTest {
.setDeadLetterPolicy(DeadLetterPolicy.newBuilder().build())
.setRetryPolicy(RetryPolicy.newBuilder().build())
.setDetached(true)
.setEnableExactlyOnceDelivery(true)
.build();
mockSubscriber.addResponse(expectedResponse);

Expand Down Expand Up @@ -147,6 +148,7 @@ public class SubscriberClientTest {
.setDeadLetterPolicy(DeadLetterPolicy.newBuilder().build())
.setRetryPolicy(RetryPolicy.newBuilder().build())
.setDetached(true)
.setEnableExactlyOnceDelivery(true)
.build();
mockSubscriber.addResponse(expectedResponse);

Expand Down Expand Up @@ -206,6 +208,7 @@ public class SubscriberClientTest {
.setDeadLetterPolicy(DeadLetterPolicy.newBuilder().build())
.setRetryPolicy(RetryPolicy.newBuilder().build())
.setDetached(true)
.setEnableExactlyOnceDelivery(true)
.build();
mockSubscriber.addResponse(expectedResponse);

Expand Down Expand Up @@ -265,6 +268,7 @@ public class SubscriberClientTest {
.setDeadLetterPolicy(DeadLetterPolicy.newBuilder().build())
.setRetryPolicy(RetryPolicy.newBuilder().build())
.setDetached(true)
.setEnableExactlyOnceDelivery(true)
.build();
mockSubscriber.addResponse(expectedResponse);

Expand Down Expand Up @@ -324,6 +328,7 @@ public class SubscriberClientTest {
.setDeadLetterPolicy(DeadLetterPolicy.newBuilder().build())
.setRetryPolicy(RetryPolicy.newBuilder().build())
.setDetached(true)
.setEnableExactlyOnceDelivery(true)
.build();
mockSubscriber.addResponse(expectedResponse);

Expand Down Expand Up @@ -373,6 +378,7 @@ public class SubscriberClientTest {
.setDeadLetterPolicy(DeadLetterPolicy.newBuilder().build())
.setRetryPolicy(RetryPolicy.newBuilder().build())
.setDetached(true)
.setEnableExactlyOnceDelivery(true)
.build();
mockSubscriber.addResponse(expectedResponse);

Expand Down Expand Up @@ -422,6 +428,7 @@ public class SubscriberClientTest {
.setDeadLetterPolicy(DeadLetterPolicy.newBuilder().build())
.setRetryPolicy(RetryPolicy.newBuilder().build())
.setDetached(true)
.setEnableExactlyOnceDelivery(true)
.build();
mockSubscriber.addResponse(expectedResponse);

Expand Down Expand Up @@ -939,6 +946,10 @@ public class SubscriberClientTest {
StreamingPullResponse expectedResponse =
StreamingPullResponse.newBuilder()
.addAllReceivedMessages(new ArrayList<ReceivedMessage>())
.setAcknowlegeConfirmation(
StreamingPullResponse.AcknowledgeConfirmation.newBuilder().build())
.setModifyAckDeadlineConfirmation(
StreamingPullResponse.ModifyAckDeadlineConfirmation.newBuilder().build())
.setSubscriptionProperties(
StreamingPullResponse.SubscriptionProperties.newBuilder().build())
.build();
Expand Down
11 changes: 11 additions & 0 deletions test/integration/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ API_GAPIC_TARGETS = {
"library": "@com_google_googleapis//google/example/library/v1:library_java_gapic",
# REGAPIC test.
"compute": "@com_google_googleapis//google/cloud/compute/v1small:compute_small_java_gapic",
# Routing headers.
"bigtable": "@com_google_googleapis//google/bigtable/v2:bigtable_java_gapic",
}

[filegroup(
Expand Down Expand Up @@ -124,6 +126,15 @@ java_gapic_test(
runtime_deps = ["@com_google_googleapis//google/iam/credentials/v1:credentials_java_gapic_test"],
)

# Bigtable API
java_gapic_test(
name = "bigtable_java_gapic_test_suite",
test_classes = [
"com.google.cloud.bigtable.data.v2.BaseBigtableDataClientTest",
],
runtime_deps = ["@com_google_googleapis//google/bigtable/v2:bigtable_java_gapic_test"],
)

# IAM (for a standalone mixed-in API).
java_gapic_library(
name = "iam_java_gapic",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
/*
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.bigtable.v2;

import com.google.api.pathtemplate.PathTemplate;
import com.google.api.resourcenames.ResourceName;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import javax.annotation.Generated;

// AUTO-GENERATED DOCUMENTATION AND CLASS.
@Generated("by gapic-generator-java")
public class TableName implements ResourceName {
private static final PathTemplate PROJECT_INSTANCE_TABLE =
PathTemplate.createWithoutUrlEncoding(
"projects/{project}/instances/{instance}/tables/{table}");
private volatile Map<String, String> fieldValuesMap;
private final String project;
private final String instance;
private final String table;

@Deprecated
protected TableName() {
project = null;
instance = null;
table = null;
}

private TableName(Builder builder) {
project = Preconditions.checkNotNull(builder.getProject());
instance = Preconditions.checkNotNull(builder.getInstance());
table = Preconditions.checkNotNull(builder.getTable());
}

public String getProject() {
return project;
}

public String getInstance() {
return instance;
}

public String getTable() {
return table;
}

public static Builder newBuilder() {
return new Builder();
}

public Builder toBuilder() {
return new Builder(this);
}

public static TableName of(String project, String instance, String table) {
return newBuilder().setProject(project).setInstance(instance).setTable(table).build();
}

public static String format(String project, String instance, String table) {
return newBuilder()
.setProject(project)
.setInstance(instance)
.setTable(table)
.build()
.toString();
}

public static TableName parse(String formattedString) {
if (formattedString.isEmpty()) {
return null;
}
Map<String, String> matchMap =
PROJECT_INSTANCE_TABLE.validatedMatch(
formattedString, "TableName.parse: formattedString not in valid format");
return of(matchMap.get("project"), matchMap.get("instance"), matchMap.get("table"));
}

public static List<TableName> parseList(List<String> formattedStrings) {
List<TableName> list = new ArrayList<>(formattedStrings.size());
for (String formattedString : formattedStrings) {
list.add(parse(formattedString));
}
return list;
}

public static List<String> toStringList(List<TableName> values) {
List<String> list = new ArrayList<>(values.size());
for (TableName value : values) {
if (value == null) {
list.add("");
} else {
list.add(value.toString());
}
}
return list;
}

public static boolean isParsableFrom(String formattedString) {
return PROJECT_INSTANCE_TABLE.matches(formattedString);
}

@Override
public Map<String, String> getFieldValuesMap() {
if (fieldValuesMap == null) {
synchronized (this) {
if (fieldValuesMap == null) {
ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
if (project != null) {
fieldMapBuilder.put("project", project);
}
if (instance != null) {
fieldMapBuilder.put("instance", instance);
}
if (table != null) {
fieldMapBuilder.put("table", table);
}
fieldValuesMap = fieldMapBuilder.build();
}
}
}
return fieldValuesMap;
}

public String getFieldValue(String fieldName) {
return getFieldValuesMap().get(fieldName);
}

@Override
public String toString() {
return PROJECT_INSTANCE_TABLE.instantiate(
"project", project, "instance", instance, "table", table);
}

@Override
public boolean equals(Object o) {
if (o == this) {
return true;
}
if (o != null || getClass() == o.getClass()) {
TableName that = ((TableName) o);
return Objects.equals(this.project, that.project)
&& Objects.equals(this.instance, that.instance)
&& Objects.equals(this.table, that.table);
}
return false;
}

@Override
public int hashCode() {
int h = 1;
h *= 1000003;
h ^= Objects.hashCode(project);
h *= 1000003;
h ^= Objects.hashCode(instance);
h *= 1000003;
h ^= Objects.hashCode(table);
return h;
}

/** Builder for projects/{project}/instances/{instance}/tables/{table}. */
public static class Builder {
private String project;
private String instance;
private String table;

protected Builder() {}

public String getProject() {
return project;
}

public String getInstance() {
return instance;
}

public String getTable() {
return table;
}

public Builder setProject(String project) {
this.project = project;
return this;
}

public Builder setInstance(String instance) {
this.instance = instance;
return this;
}

public Builder setTable(String table) {
this.table = table;
return this;
}

private Builder(TableName tableName) {
this.project = tableName.project;
this.instance = tableName.instance;
this.table = tableName.table;
}

public TableName build() {
return new TableName(this);
}
}
}
Loading

0 comments on commit 2ce9f42

Please sign in to comment.