Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content
This repository was archived by the owner on Feb 24, 2026. It is now read-only.

Commit 7ac47de

Browse files
fix: remove dependency on google-cloud-bigquery (cyclic dep) (#1295)
Fixes #1249
1 parent 0e749d9 commit 7ac47de

19 files changed

Lines changed: 160 additions & 1762 deletions

File tree

.kokoro/dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ function completenessCheck() {
4747
# This is stripped from the output as it is not present in the flattened pom.
4848
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
4949
msg "Generating dependency list using original pom..."
50-
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
50+
mvn dependency:list -f pom.xml -DincludeScope=runtime -DexcludeArtifactIds=gson,commons-codec,commons-logging,opencensus-contrib-http-util,httpclient,httpcore -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
5151

5252
# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
5353
msg "Generating dependency list using flattened pom..."
54-
mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt
54+
mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -DexcludeArtifactIds=gson,commons-codec,commons-logging,opencensus-contrib-http-util,httpclient,httpcore -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt
5555

5656
# Compare two dependency lists
5757
msg "Comparing dependency lists..."
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<difference>
5+
<differenceType>8001</differenceType>
6+
<className>com/google/cloud/bigquery/storage/v1beta2/BQV2ToBQStorageConverter</className>
7+
<method>com.google.cloud.bigquery.storage.v1beta2.BQV2ToBQStorageConverter</method>
8+
</difference>
9+
<difference>
10+
<differenceType>8001</differenceType>
11+
<className>com/google/cloud/bigquery/storage/v1beta2/SchemaCompatibility</className>
12+
<method>com.google.cloud.bigquery.storage.v1beta2.SchemaCompatibility</method>
13+
</difference>
14+
<difference>
15+
<differenceType>7002</differenceType>
16+
<className>com/google/cloud/bigquery/storage/v1beta2/JsonStreamWriter</className>
17+
<method>com.google.cloud.bigquery.storage.v1beta2.JsonStreamWriter$Builder newBuilder(java.lang.String, com.google.cloud.bigquery.Schema)</method>
18+
</difference>
19+
</differences>

google-cloud-bigquerystorage/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@
146146
<dependency>
147147
<groupId>com.google.cloud</groupId>
148148
<artifactId>google-cloud-bigquery</artifactId>
149+
<scope>test</scope>
149150
</dependency>
150151
<dependency>
151152
<groupId>com.google.code.findbugs</groupId>

google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BQV2ToBQStorageConverter.java

Lines changed: 0 additions & 85 deletions
This file was deleted.

google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/JsonStreamWriter.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.google.api.gax.batching.FlowControlSettings;
2020
import com.google.api.gax.core.CredentialsProvider;
2121
import com.google.api.gax.rpc.TransportChannelProvider;
22-
import com.google.cloud.bigquery.Schema;
2322
import com.google.common.base.Preconditions;
2423
import com.google.protobuf.Descriptors;
2524
import com.google.protobuf.Descriptors.Descriptor;
@@ -202,23 +201,6 @@ public static Builder newBuilder(String streamOrTableName, TableSchema tableSche
202201
return new Builder(streamOrTableName, tableSchema, null);
203202
}
204203

205-
/**
206-
* newBuilder that constructs a JsonStreamWriter builder with BigQuery client being initialized by
207-
* StreamWriter by default.
208-
*
209-
* @param streamOrTableName name of the stream that must follow
210-
* "projects/[^/]+/datasets/[^/]+/tables/[^/]+/streams/[^/]+"
211-
* @param tableSchema The schema of the table when the stream was created, which is passed back
212-
* through {@code WriteStream}
213-
* @return Builder
214-
*/
215-
public static Builder newBuilder(String streamOrTableName, Schema tableSchema) {
216-
Preconditions.checkNotNull(streamOrTableName, "StreamOrTableName is null.");
217-
Preconditions.checkNotNull(tableSchema, "TableSchema is null.");
218-
return new Builder(
219-
streamOrTableName, BQV2ToBQStorageConverter.ConvertTableSchema(tableSchema), null);
220-
}
221-
222204
/**
223205
* newBuilder that constructs a JsonStreamWriter builder.
224206
*

0 commit comments

Comments
 (0)