Skip to content

Commit c6f8aef

Browse files
nicholslnicholsl
authored
Merge branch 'googleapis:main' into feature/channel-pool-health-checking-stub
2 parents 30af3b6 + a958811 commit c6f8aef

29 files changed

Lines changed: 274 additions & 120 deletions

File tree

‎google-cloud-bigtable-bom/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-bigtable-bom</artifactId>
6-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
@@ -63,37 +63,37 @@
6363
<dependency>
6464
<groupId>com.google.cloud</groupId>
6565
<artifactId>google-cloud-bigtable</artifactId>
66-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6767
</dependency>
6868
<dependency>
6969
<groupId>com.google.cloud</groupId>
7070
<artifactId>google-cloud-bigtable-emulator</artifactId>
71-
<version>0.199.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
71+
<version>0.199.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
7272
</dependency>
7373
<dependency>
7474
<groupId>com.google.cloud</groupId>
7575
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
76-
<version>0.199.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
76+
<version>0.199.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
7777
</dependency>
7878
<dependency>
7979
<groupId>com.google.api.grpc</groupId>
8080
<artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
81-
<version>2.62.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
81+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
8282
</dependency>
8383
<dependency>
8484
<groupId>com.google.api.grpc</groupId>
8585
<artifactId>grpc-google-cloud-bigtable-v2</artifactId>
86-
<version>2.62.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
86+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
8787
</dependency>
8888
<dependency>
8989
<groupId>com.google.api.grpc</groupId>
9090
<artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
91-
<version>2.62.0</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
91+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
9292
</dependency>
9393
<dependency>
9494
<groupId>com.google.api.grpc</groupId>
9595
<artifactId>proto-google-cloud-bigtable-v2</artifactId>
96-
<version>2.62.0</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
96+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
9797
</dependency>
9898
</dependencies>
9999
</dependencyManagement>

‎google-cloud-bigtable-deps-bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<groupId>com.google.cloud</groupId>
1515
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
16-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
16+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1717

1818
<packaging>pom</packaging>
1919
<name>Google Cloud Bigtable Dependency BOM</name>

‎google-cloud-bigtable-emulator-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<artifactId>google-cloud-bigtable-parent</artifactId>
99
<groupId>com.google.cloud</groupId>
10-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
10+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1111
</parent>
1212
<name>Google Cloud Java - Bigtable Emulator Core</name>
1313

1414
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
15-
<version>0.199.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
15+
<version>0.199.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
1616

1717
<description>
1818
A Java wrapper for the Cloud Bigtable emulator.

‎google-cloud-bigtable-emulator/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<artifactId>google-cloud-bigtable-emulator</artifactId>
8-
<version>0.199.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
8+
<version>0.199.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
99
<name>Google Cloud Java - Bigtable Emulator</name>
1010
<url>https://github.com/googleapis/java-bigtable</url>
1111
<description>
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>google-cloud-bigtable-parent</artifactId>
17-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
17+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1818
</parent>
1919
<scm>
2020
<connection>scm:git:git@github.com:googleapis/java-bigtable.git</connection>
@@ -81,14 +81,14 @@
8181
<dependency>
8282
<groupId>com.google.cloud</groupId>
8383
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
84-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
84+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
8585
<type>pom</type>
8686
<scope>import</scope>
8787
</dependency>
8888
<dependency>
8989
<groupId>com.google.cloud</groupId>
9090
<artifactId>google-cloud-bigtable-bom</artifactId>
91-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
91+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
9292
<type>pom</type>
9393
<scope>import</scope>
9494
</dependency>
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>com.google.cloud</groupId>
101101
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
102-
<version>0.199.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
102+
<version>0.199.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
103103
</dependency>
104104

105105
<dependency>

‎google-cloud-bigtable/pom.xml‎

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>google-cloud-bigtable</artifactId>
5-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
5+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
66
<packaging>jar</packaging>
77
<name>Google Cloud Bigtable</name>
88
<url>https://github.com/googleapis/java-bigtable</url>
@@ -12,11 +12,11 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-bigtable-parent</artifactId>
15-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
15+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1616
</parent>
1717
<properties>
1818
<!-- The version that will be embedded in the published jar via maven-resources-plugin -->
19-
<java-bigtable.version>2.62.0</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
19+
<java-bigtable.version>2.62.1-SNAPSHOT</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
2020

2121
<site.installationModule>google-cloud-bigtable</site.installationModule>
2222

@@ -54,14 +54,14 @@
5454
<dependency>
5555
<groupId>com.google.cloud</groupId>
5656
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
57-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
57+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>
6161
<dependency>
6262
<groupId>com.google.cloud</groupId>
6363
<artifactId>google-cloud-bigtable-bom</artifactId>
64-
<version>2.62.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
64+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>
@@ -400,6 +400,50 @@
400400
</plugins>
401401
</build>
402402
</profile>
403+
<profile>
404+
<id>error-prone</id>
405+
<activation>
406+
<!-- errorprone requires >= jdk17 -->
407+
<jdk>[17,)</jdk>
408+
</activation>
409+
<build>
410+
<pluginManagement>
411+
<plugins>
412+
<plugin>
413+
<groupId>org.apache.maven.plugins</groupId>
414+
<artifactId>maven-compiler-plugin</artifactId>
415+
<configuration>
416+
<fork>true</fork>
417+
418+
<compilerArgs>
419+
<arg>-XDcompilePolicy=simple</arg>
420+
<arg>--should-stop=ifError=FLOW</arg>
421+
<arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/generated-sources/.*</arg>
422+
423+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
424+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
425+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
426+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
427+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
428+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
429+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
430+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
431+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
432+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
433+
</compilerArgs>
434+
<annotationProcessorPaths combine.children="append">
435+
<path>
436+
<groupId>com.google.errorprone</groupId>
437+
<artifactId>error_prone_core</artifactId>
438+
<version>${error-prone.version}</version>
439+
</path>
440+
</annotationProcessorPaths>
441+
</configuration>
442+
</plugin>
443+
</plugins>
444+
</pluginManagement>
445+
</build>
446+
</profile>
403447
<profile>
404448
<id>enable-verbose-grpc-logs</id>
405449
<properties>

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
@InternalApi("For internal use only")
2121
public final class Version {
2222
// {x-version-update-start:google-cloud-bigtable:current}
23-
public static String VERSION = "2.62.0";
23+
public static String VERSION = "2.62.1-SNAPSHOT";
2424
// {x-version-update-end}
2525
}

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,6 @@ void checkToString(BigtableInstanceAdminSettings settings) {
163163
for (String subSettings : SETTINGS_LIST) {
164164
assertThat(toString).contains(subSettings + "=");
165165
}
166-
assertThat(toString.contains(settings.getStubSettings().toString()));
166+
assertThat(toString).contains(settings.getStubSettings().toString());
167167
}
168168
}

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableCmekIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public static void validatePlatform() throws IOException {
100100
Sets.difference(
101101
ImmutableSet.of(
102102
testEnvRule.env().getPrimaryZone(), testEnvRule.env().getSecondaryZone()),
103-
ImmutableSet.of(zones))
103+
ImmutableSet.copyOf(zones))
104104
.iterator()
105105
.next();
106106

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/ConsistencyRequestTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.google.bigtable.admin.v2.CheckConsistencyRequest;
2121
import com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest;
22+
import com.google.cloud.bigtable.data.v2.internal.NameUtil;
2223
import com.google.cloud.bigtable.data.v2.internal.TableAdminRequestContext;
2324
import org.junit.Test;
2425
import org.junit.runner.RunWith;
@@ -41,12 +42,11 @@ public void testToCheckConsistencyProtoWithStandard() {
4142
CheckConsistencyRequest checkConsistencyRequest =
4243
consistencyRequest.toCheckConsistencyProto(requestContext, CONSISTENCY_TOKEN);
4344

44-
assertThat(checkConsistencyRequest.getName().equals(TABLE_ID));
45-
assertThat(checkConsistencyRequest.getConsistencyToken().equals(CONSISTENCY_TOKEN));
46-
assertThat(
47-
checkConsistencyRequest
48-
.getModeCase()
49-
.equals(CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES));
45+
assertThat(checkConsistencyRequest.getName())
46+
.isEqualTo(NameUtil.formatTableName(PROJECT_ID, INSTANCE_ID, TABLE_ID));
47+
assertThat(checkConsistencyRequest.getConsistencyToken()).isEqualTo(CONSISTENCY_TOKEN);
48+
assertThat(checkConsistencyRequest.getModeCase())
49+
.isEqualTo(CheckConsistencyRequest.ModeCase.STANDARD_READ_REMOTE_WRITES);
5050
}
5151

5252
@Test
@@ -59,12 +59,11 @@ public void testToCheckConsistencyProtoWithDataBoost() {
5959
CheckConsistencyRequest checkConsistencyRequest =
6060
consistencyRequest.toCheckConsistencyProto(requestContext, CONSISTENCY_TOKEN);
6161

62-
assertThat(checkConsistencyRequest.getName().equals(TABLE_ID));
63-
assertThat(checkConsistencyRequest.getConsistencyToken().equals(CONSISTENCY_TOKEN));
64-
assertThat(
65-
checkConsistencyRequest
66-
.getModeCase()
67-
.equals(CheckConsistencyRequest.ModeCase.DATA_BOOST_READ_LOCAL_WRITES));
62+
assertThat(checkConsistencyRequest.getName())
63+
.isEqualTo(NameUtil.formatTableName(PROJECT_ID, INSTANCE_ID, TABLE_ID));
64+
assertThat(checkConsistencyRequest.getConsistencyToken()).isEqualTo(CONSISTENCY_TOKEN);
65+
assertThat(checkConsistencyRequest.getModeCase())
66+
.isEqualTo(CheckConsistencyRequest.ModeCase.DATA_BOOST_READ_LOCAL_WRITES);
6867
}
6968

7069
@Test
@@ -77,6 +76,7 @@ public void testToGenerateTokenProto() {
7776
GenerateConsistencyTokenRequest generateRequest =
7877
consistencyRequest.toGenerateTokenProto(requestContext);
7978

80-
assertThat(generateRequest.getName().equals(TABLE_ID));
79+
assertThat(generateRequest.getName())
80+
.isEqualTo(NameUtil.formatTableName(PROJECT_ID, INSTANCE_ID, TABLE_ID));
8181
}
8282
}

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/models/GCRulesTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public void durationTimeUnitNegative() {
9090
public void versions() {
9191
VersionRule actual = GCRULES.maxVersions(10);
9292
GcRule expected = buildVersionsRule(10);
93-
assertNotNull(actual.getMaxVersions());
9493
assertThat(actual.toProto()).isEqualTo(expected);
9594
}
9695

0 commit comments

Comments
 (0)