diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 393766067b..90200dea82 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigquerystorage.git", - "sha": "8316ba6cf809bc34414dfd056ed25fcf70ffa673" + "sha": "a0736fed9535c89a10ddd8b565f06aaafacc2c14" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e934b93402284f834b510ebbf421864e881dce02" + "sha": "1f9ceba741b6b4a60ce09ab98423e941f5bd47f2" } } ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 22e016586f..2479ce9d29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +### [1.22.6](https://www.github.com/googleapis/java-bigquerystorage/compare/v1.22.5...v1.22.6) (2021-06-30) + + +### Documentation + +* **sample:** add IT for WriteToDefaultStream ([#1158](https://www.github.com/googleapis/java-bigquerystorage/issues/1158)) ([3280d7a](https://www.github.com/googleapis/java-bigquerystorage/commit/3280d7a0495a25f2509c9d4719439253e0fbaa5d)), closes [#1156](https://www.github.com/googleapis/java-bigquerystorage/issues/1156) +* user-provided streamOrTableName for default write streams ([#1155](https://www.github.com/googleapis/java-bigquerystorage/issues/1155)) ([fc4a5c0](https://www.github.com/googleapis/java-bigquerystorage/commit/fc4a5c061f51d83e41109ebf04f4202276410e30)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-bigquery to v1.135.1 ([#1154](https://www.github.com/googleapis/java-bigquerystorage/issues/1154)) ([99f8ebb](https://www.github.com/googleapis/java-bigquerystorage/commit/99f8ebb2fde1fd86315a03dea5719e7a7744d081)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#1159](https://www.github.com/googleapis/java-bigquerystorage/issues/1159)) ([7e1b206](https://www.github.com/googleapis/java-bigquerystorage/commit/7e1b2062f8cb13c05270d86c9ff6863934e7478d)) + ### [1.22.5](https://www.github.com/googleapis/java-bigquerystorage/compare/v1.22.4...v1.22.5) (2021-06-28) diff --git a/README.md b/README.md index 5624d35fdb..0c990b020b 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-bigquerystorage - 1.22.4 + 1.22.5 ``` @@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-bigquerystorage' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-bigquerystorage:1.22.4' +compile 'com.google.cloud:google-cloud-bigquerystorage:1.22.5' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "1.22.4" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "1.22.5" ``` ## Authentication diff --git a/google-cloud-bigquerystorage-bom/pom.xml b/google-cloud-bigquerystorage-bom/pom.xml index 6955907719..fb29b50379 100644 --- a/google-cloud-bigquerystorage-bom/pom.xml +++ b/google-cloud-bigquerystorage-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerystorage-bom - 1.22.5 + 1.22.6 pom com.google.cloud @@ -63,37 +63,37 @@ com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.122.5 + 0.122.6 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.122.5 + 0.122.6 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 1.22.5 + 1.22.6 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.122.5 + 0.122.6 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.122.5 + 0.122.6 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 1.22.5 + 1.22.6 com.google.cloud google-cloud-bigquerystorage - 1.22.5 + 1.22.6 com.google.apis diff --git a/google-cloud-bigquerystorage/pom.xml b/google-cloud-bigquerystorage/pom.xml index 47eb6610b5..11c67d0f9a 100644 --- a/google-cloud-bigquerystorage/pom.xml +++ b/google-cloud-bigquerystorage/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerystorage - 1.22.5 + 1.22.6 jar BigQuery Storage https://github.com/googleapis/java-bigquerystorage @@ -11,7 +11,7 @@ com.google.cloud google-cloud-bigquerystorage-parent - 1.22.5 + 1.22.6 google-cloud-bigquerystorage diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/JsonStreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/JsonStreamWriter.java index 4cceeda16d..2b2e531174 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/JsonStreamWriter.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/JsonStreamWriter.java @@ -183,9 +183,8 @@ private void setStreamWriterSettings( * StreamWriter by default. * * @param streamOrTableName name of the stream that must follow - * "projects/[^/]+/datasets/[^/]+/tables/[^/]+/streams/[^/]+" or if it is default stream - * (createDefaultStream is true on builder), then the name here should be a table name - * ""projects/[^/]+/datasets/[^/]+/tables/[^/]+" + * "projects/[^/]+/datasets/[^/]+/tables/[^/]+/streams/[^/]+" or table name + * "projects/[^/]+/datasets/[^/]+/tables/[^/]+" * @param tableSchema The schema of the table when the stream was created, which is passed back * through {@code WriteStream} * @return Builder @@ -260,7 +259,7 @@ public static final class Builder { * * @param streamOrTableName name of the stream that must follow * "projects/[^/]+/datasets/[^/]+/tables/[^/]+/streams/[^/]+" or - * "projects/[^/]+/datasets/[^/]+/tables/[^/]+/_default" + * "projects/[^/]+/datasets/[^/]+/tables/[^/]+" * @param tableSchema schema used to convert Json to proto messages. * @param client */ diff --git a/grpc-google-cloud-bigquerystorage-v1/pom.xml b/grpc-google-cloud-bigquerystorage-v1/pom.xml index 7e4c4021d6..004bec4174 100644 --- a/grpc-google-cloud-bigquerystorage-v1/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 1.22.5 + 1.22.6 grpc-google-cloud-bigquerystorage-v1 GRPC library for grpc-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 1.22.5 + 1.22.6 diff --git a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml index 15e6708647..b602f9dc5b 100644 --- a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.122.5 + 0.122.6 grpc-google-cloud-bigquerystorage-v1beta1 GRPC library for grpc-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 1.22.5 + 1.22.6 diff --git a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml index 4f6a90a56f..6efb7713b4 100644 --- a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.122.5 + 0.122.6 grpc-google-cloud-bigquerystorage-v1beta2 GRPC library for grpc-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 1.22.5 + 1.22.6 diff --git a/pom.xml b/pom.xml index fd82e68fe2..77f105cbc2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bigquerystorage-parent pom - 1.22.5 + 1.22.6 BigQuery Storage Parent https://github.com/googleapis/java-bigquerystorage @@ -85,49 +85,49 @@ com.google.cloud google-cloud-shared-dependencies - 1.3.0 + 1.4.0 pom import com.google.cloud google-cloud-bigquery - 1.135.0 + 1.135.1 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.122.5 + 0.122.6 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.122.5 + 0.122.6 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 1.22.5 + 1.22.6 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.122.5 + 0.122.6 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.122.5 + 0.122.6 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 1.22.5 + 1.22.6 com.google.cloud google-cloud-bigquerystorage - 1.22.5 + 1.22.6 org.json diff --git a/proto-google-cloud-bigquerystorage-v1/pom.xml b/proto-google-cloud-bigquerystorage-v1/pom.xml index 7f3df6cc2a..df178a95d3 100644 --- a/proto-google-cloud-bigquerystorage-v1/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 1.22.5 + 1.22.6 proto-google-cloud-bigquerystorage-v1 PROTO library for proto-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 1.22.5 + 1.22.6 diff --git a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml index dd887f6aa8..e5ead25825 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.122.5 + 0.122.6 proto-google-cloud-bigquerystorage-v1beta1 PROTO library for proto-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 1.22.5 + 1.22.6 diff --git a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml index b074ad949e..624e238b59 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.122.5 + 0.122.6 proto-google-cloud-bigquerystorage-v1beta2 PROTO library for proto-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 1.22.5 + 1.22.6 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index ed6f856c42..ffa2a7f361 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -30,7 +30,7 @@ com.google.cloud google-cloud-bigquerystorage - 1.22.4 + 1.22.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index b8aca6a735..220b592642 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigquerystorage - 1.22.5 + 1.22.6 diff --git a/samples/snippets/src/main/java/com/example/bigquerystorage/WriteToDefaultStream.java b/samples/snippets/src/main/java/com/example/bigquerystorage/WriteToDefaultStream.java index 028e1c037c..b85edd38bb 100644 --- a/samples/snippets/src/main/java/com/example/bigquerystorage/WriteToDefaultStream.java +++ b/samples/snippets/src/main/java/com/example/bigquerystorage/WriteToDefaultStream.java @@ -52,7 +52,7 @@ public static void writeToDefaultStream(String projectId, String datasetName, St // Use the JSON stream writer to send records in JSON format. // For more information about JsonStreamWriter, see: - // https://googleapis.dev/java/google-cloud-bigquerystorage/latest/com/google/cloud/bigquery/storage/v1beta2/JstreamWriter.html + // https://googleapis.dev/java/google-cloud-bigquerystorage/latest/com/google/cloud/bigquery/storage/v1beta2/JsonStreamWriter.html try (JsonStreamWriter writer = JsonStreamWriter.newBuilder(parentTable.toString(), schema).build()) { // Append 10 JSON objects to the stream. diff --git a/samples/snippets/src/test/java/com/example/bigquerystorage/WriteToDefaultStreamIT.java b/samples/snippets/src/test/java/com/example/bigquerystorage/WriteToDefaultStreamIT.java new file mode 100644 index 0000000000..a0047cbb32 --- /dev/null +++ b/samples/snippets/src/test/java/com/example/bigquerystorage/WriteToDefaultStreamIT.java @@ -0,0 +1,96 @@ +/* + * 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 + * + * http://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.example.bigquerystorage; + +import static com.google.common.truth.Truth.assertThat; +import static junit.framework.TestCase.assertNotNull; + +import com.google.cloud.bigquery.BigQuery; +import com.google.cloud.bigquery.BigQuery.DatasetDeleteOption; +import com.google.cloud.bigquery.BigQueryOptions; +import com.google.cloud.bigquery.DatasetId; +import com.google.cloud.bigquery.DatasetInfo; +import com.google.cloud.bigquery.Field; +import com.google.cloud.bigquery.Schema; +import com.google.cloud.bigquery.StandardSQLTypeName; +import com.google.cloud.bigquery.StandardTableDefinition; +import com.google.cloud.bigquery.TableId; +import com.google.cloud.bigquery.TableInfo; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.UUID; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +@RunWith(JUnit4.class) +public class WriteToDefaultStreamIT { + + private static final String GOOGLE_CLOUD_PROJECT = System.getenv("GOOGLE_CLOUD_PROJECT"); + + private ByteArrayOutputStream bout; + private PrintStream out; + private BigQuery bigquery; + private String datasetName; + private String tableName; + + private static void requireEnvVar(String varName) { + assertNotNull( + "Environment variable " + varName + " is required to perform these tests.", + System.getenv(varName)); + } + + @BeforeClass + public static void checkRequirements() { + requireEnvVar("GOOGLE_CLOUD_PROJECT"); + } + + @Before + public void setUp() { + bout = new ByteArrayOutputStream(); + out = new PrintStream(bout); + System.setOut(out); + + bigquery = BigQueryOptions.getDefaultInstance().getService(); + + // Create a new dataset and table for each test. + datasetName = "WRITE_STREAM_TEST" + UUID.randomUUID().toString().substring(0, 8); + tableName = "DEFAULT_STREAM_TEST" + UUID.randomUUID().toString().substring(0, 8); + Schema schema = Schema.of(Field.of("col1", StandardSQLTypeName.STRING)); + bigquery.create(DatasetInfo.newBuilder(datasetName).build()); + TableInfo tableInfo = + TableInfo.newBuilder(TableId.of(datasetName, tableName), StandardTableDefinition.of(schema)) + .build(); + bigquery.create(tableInfo); + } + + @After + public void tearDown() { + bigquery.delete( + DatasetId.of(GOOGLE_CLOUD_PROJECT, datasetName), DatasetDeleteOption.deleteContents()); + System.setOut(null); + } + + @Test + public void testWriteToDefaultStream() throws Exception { + WriteToDefaultStream.writeToDefaultStream(GOOGLE_CLOUD_PROJECT, datasetName, tableName); + assertThat(bout.toString()).contains("Appended records successfully."); + } +} diff --git a/versions.txt b/versions.txt index 938a82d160..704ede5a9c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-bigquerystorage-v1beta1:0.122.5:0.122.5 -proto-google-cloud-bigquerystorage-v1beta2:0.122.5:0.122.5 -proto-google-cloud-bigquerystorage-v1:1.22.5:1.22.5 -grpc-google-cloud-bigquerystorage-v1beta1:0.122.5:0.122.5 -grpc-google-cloud-bigquerystorage-v1beta2:0.122.5:0.122.5 -grpc-google-cloud-bigquerystorage-v1:1.22.5:1.22.5 -google-cloud-bigquerystorage:1.22.5:1.22.5 +proto-google-cloud-bigquerystorage-v1beta1:0.122.6:0.122.6 +proto-google-cloud-bigquerystorage-v1beta2:0.122.6:0.122.6 +proto-google-cloud-bigquerystorage-v1:1.22.6:1.22.6 +grpc-google-cloud-bigquerystorage-v1beta1:0.122.6:0.122.6 +grpc-google-cloud-bigquerystorage-v1beta2:0.122.6:0.122.6 +grpc-google-cloud-bigquerystorage-v1:1.22.6:1.22.6 +google-cloud-bigquerystorage:1.22.6:1.22.6