Skip to content

Commit 9499663

Browse files
igorbernstein2igorbernstein2
authored
---
yaml --- r: 15295 b: refs/heads/autosynth-bigtable c: 0fa1ef6 h: refs/heads/master i: 15293: 4bee03e 15291: 09513cf 15287: 71d4fd5 15279: 2f6e8cf 15263: 58cfa02 15231: cb2661d
1 parent 2b9b11b commit 9499663

10 files changed

Lines changed: 9 additions & 378 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ refs/heads/autosynth-asset: cd8251de8c40e239ad24dcf9ed93ea2708a3eed5
126126
refs/heads/autosynth-automl: cced2f56bbef0499609073edbca6253e1df5e535
127127
refs/heads/autosynth-bigquerydatatransfer: a6667617707608b1dbfb02d59c22b5152f208da7
128128
refs/heads/autosynth-bigquerystorage: 14ab055598b943ae3f33f484e9fb1653355d08e7
129-
refs/heads/autosynth-bigtable: f7f692f2e6d839487042b3167a81abea2a9803d6
129+
refs/heads/autosynth-bigtable: 0fa1ef644700e1bba620d66234ae7a5a404b9404
130130
refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
131131
refs/heads/autosynth-containeranalysis: 781fdb430a60f9a6491f116e31e4e10118157bdb
132132
refs/heads/autosynth-datastore: af1fb76aa3eee02fe6f31f8fa1c72a4f048d149b

‎branches/autosynth-bigtable/google-cloud-clients/google-cloud-bigtable/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ at the top of your file:
7272

7373
```java
7474
import com.google.cloud.bigtable.data.v2.BigtableDataClient;
75-
import com.google.cloud.bigtable.data.v2.models.InstanceName;
7675
import com.google.cloud.bigtable.data.v2.models.Query;
7776
import com.google.cloud.bigtable.data.v2.models.Row;
7877

‎branches/autosynth-bigtable/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.google.cloud.bigtable.admin.v2;
1717

18-
import com.google.bigtable.admin.v2.ProjectName;
1918
import com.google.cloud.bigtable.admin.v2.stub.BigtableInstanceAdminStubSettings;
2019
import com.google.common.base.Preconditions;
2120
import com.google.common.base.Verify;
@@ -61,17 +60,6 @@ public String getProjectId() {
6160
return projectId;
6261
}
6362

64-
/**
65-
* Gets the name of the project whose instances the client will manager.
66-
*
67-
* @deprecated Please use {@link #getProjectId()}.
68-
*/
69-
@Deprecated
70-
@Nonnull
71-
public com.google.bigtable.admin.v2.ProjectName getProjectName() {
72-
return ProjectName.of(projectId);
73-
}
74-
7563
/** Gets the underlying RPC settings. */
7664
@Nonnull
7765
public BigtableInstanceAdminStubSettings getStubSettings() {
@@ -115,30 +103,6 @@ public String getProjectId() {
115103
return projectId;
116104
}
117105

118-
/**
119-
* Sets the name of instance whose tables the client will manage.
120-
*
121-
* @deprecated Please use {@link #setProjectId(String)}.
122-
*/
123-
@Deprecated
124-
public Builder setProjectName(@Nonnull com.google.bigtable.admin.v2.ProjectName projectName) {
125-
return setProjectId(projectName.getProject());
126-
}
127-
128-
/**
129-
* Gets the name of the project whose instances the client will manage.
130-
*
131-
* @deprecated Please use {@link #getProjectId()}.
132-
*/
133-
@Deprecated
134-
@Nullable
135-
public ProjectName getProjectName() {
136-
if (projectId != null) {
137-
return ProjectName.of(projectId);
138-
}
139-
return null;
140-
}
141-
142106
/**
143107
* Returns the builder for the settings used for all RPCs.
144108
*

‎branches/autosynth-bigtable/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.google.common.base.Preconditions;
2020
import com.google.common.base.Verify;
2121
import java.io.IOException;
22-
import javax.annotation.Nonnull;
2322
import javax.annotation.Nullable;
2423

2524
/**
@@ -65,17 +64,6 @@ public String getInstanceId() {
6564
return instanceId;
6665
}
6766

68-
/**
69-
* Gets the name of instance whose tables the client will manage.
70-
*
71-
* @deprecated Please use {@link #getProjectId()} and {@link #getInstanceId()}.
72-
*/
73-
@Deprecated
74-
@Nonnull
75-
public com.google.bigtable.admin.v2.InstanceName getInstanceName() {
76-
return com.google.bigtable.admin.v2.InstanceName.of(projectId, instanceId);
77-
}
78-
7967
/** Gets the underlying RPC settings. */
8068
public BigtableTableAdminStubSettings getStubSettings() {
8169
return stubSettings;
@@ -133,34 +121,6 @@ public String getInstanceId() {
133121
return instanceId;
134122
}
135123

136-
/**
137-
* Sets the name of instance whose tables the client will manage.
138-
*
139-
* @deprecated Please use {@link #setProjectId(String)} and {@link #setInstanceId(String)}.
140-
*/
141-
@Deprecated
142-
public Builder setInstanceName(
143-
@Nonnull com.google.bigtable.admin.v2.InstanceName instanceName) {
144-
Preconditions.checkNotNull(instanceName);
145-
this.projectId = instanceName.getProject();
146-
this.instanceId = instanceName.getInstance();
147-
return this;
148-
}
149-
150-
/**
151-
* Gets the name of instance whose tables the client will manage.
152-
*
153-
* @deprecated Please use {@link #getProjectId()} and {@link #getInstanceId()}.
154-
*/
155-
@Deprecated
156-
@Nullable
157-
public com.google.bigtable.admin.v2.InstanceName getInstanceName() {
158-
if (projectId != null && instanceId != null) {
159-
return com.google.bigtable.admin.v2.InstanceName.of(projectId, instanceId);
160-
}
161-
return null;
162-
}
163-
164124
/**
165125
* Returns the builder for the settings used for all RPCs.
166126
*

‎branches/autosynth-bigtable/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataClient.java‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,6 @@ public static BigtableDataClient create(String projectId, String instanceId) thr
126126
return create(settings);
127127
}
128128

129-
/**
130-
* Constructs an instance of BigtableDataClient with default settings.
131-
*
132-
* @param instanceName The instance to connect to.
133-
* @return A new client.
134-
* @throws IOException If any.
135-
* @deprecated Please use {@link #create(String, String)}.
136-
*/
137-
@Deprecated
138-
public static BigtableDataClient create(
139-
com.google.cloud.bigtable.data.v2.models.InstanceName instanceName) throws IOException {
140-
BigtableDataSettings settings =
141-
BigtableDataSettings.newBuilder().setInstanceName(instanceName).build();
142-
return create(settings);
143-
}
144-
145129
/**
146130
* Constructs an instance of BigtableDataClient, using the given settings. The channels are
147131
* created based on the settings passed in, or defaults for any settings that are not set.
@@ -260,8 +244,7 @@ public Row readRow(String tableId, String rowKey, @Nullable Filter filter) {
260244
* <p>Sample code:
261245
*
262246
* <pre>{@code
263-
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
264-
* try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
247+
* try (BigtableDataClient bigtableDataClient = BigtableDataClient.create("[PROJECT]", "[INSTANCE]")) {
265248
* String tableId = "[TABLE]";
266249
*
267250
* // Build the filter expression
@@ -400,8 +383,7 @@ public ApiFuture<Row> readRowAsync(String tableId, String rowKey, @Nullable Filt
400383
* <p>Sample code:
401384
*
402385
* <pre>{@code
403-
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
404-
* try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
386+
* try (BigtableDataClient bigtableDataClient = BigtableDataClient.create("[PROJECT]", "[INSTANCE]")) {
405387
* String tableId = "[TABLE]";
406388
*
407389
* // Build the filter expression
@@ -442,8 +424,7 @@ public ApiFuture<Row> readRowAsync(String tableId, ByteString rowKey, @Nullable
442424
* <p>Sample code:
443425
*
444426
* <pre>{@code
445-
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
446-
* try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
427+
* try (BigtableDataClient bigtableDataClient = BigtableDataClient.create("[PROJECT]", "[INSTANCE]")) {
447428
* String tableId = "[TABLE]";
448429
*
449430
* Query query = Query.create(tableId)
@@ -495,8 +476,7 @@ public UnaryCallable<Query, Row> readRowCallable() {
495476
* <p>Sample code:
496477
*
497478
* <pre>{@code
498-
* InstanceName instanceName = InstanceName.of("[PROJECT]", "[INSTANCE]");
499-
* try (BigtableDataClient bigtableDataClient = BigtableDataClient.create(instanceName)) {
479+
* try (BigtableDataClient bigtableDataClient = BigtableDataClient.create("[PROJECT]", "[INSTANCE]")) {
500480
* String tableId = "[TABLE]";
501481
*
502482
* Query query = Query.create(tableId)

‎branches/autosynth-bigtable/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,6 @@ public static Builder newBuilder() {
6767
return new Builder();
6868
}
6969

70-
/**
71-
* Returns the target instance.
72-
*
73-
* @deprecated Please use {@link #getProjectId()} and {@link #getInstanceId()}.
74-
*/
75-
@Deprecated()
76-
public com.google.cloud.bigtable.data.v2.models.InstanceName getInstanceName() {
77-
return getTypedStubSettings().getInstanceName();
78-
}
79-
8070
/** Returns the target project id. */
8171
public String getProjectId() {
8272
return getTypedStubSettings().getProjectId();
@@ -159,30 +149,6 @@ private Builder(BigtableDataSettings settings) {
159149
}
160150

161151
// <editor-fold desc="Public API">
162-
/**
163-
* Sets the target instance. This setting is required. All RPCs will be made in the context of
164-
* this setting.
165-
*
166-
* @deprecated Please use {@link #setProjectId(String)} and {@link #setInstanceId(String)}.
167-
*/
168-
@Deprecated
169-
public Builder setInstanceName(
170-
@Nonnull com.google.cloud.bigtable.data.v2.models.InstanceName instanceName) {
171-
getTypedStubSettings().setInstanceName(instanceName);
172-
return this;
173-
}
174-
175-
/**
176-
* Gets the {@link com.google.cloud.bigtable.data.v2.models.InstanceName} that was previously
177-
* set on this Builder.
178-
*
179-
* @deprecated Please use {@link #getProjectId()} and {@link #getInstanceId()}.
180-
*/
181-
@Deprecated
182-
public com.google.cloud.bigtable.data.v2.models.InstanceName getInstanceName() {
183-
return getTypedStubSettings().getInstanceName();
184-
}
185-
186152
/**
187153
* Sets the target project. This setting is required. All RPCs will be made in the context of
188154
* this setting.

‎branches/autosynth-bigtable/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/internal/RequestContext.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,12 @@ public static RequestContext create(String projectId, String instanceId, String
3838
return new AutoValue_RequestContext(projectId, instanceId, appProfileId);
3939
}
4040

41-
/** @deprecated Please use {@link #create(String, String, String)}. */
42-
@Deprecated
43-
public static RequestContext create(
44-
com.google.cloud.bigtable.data.v2.models.InstanceName instanceName, String appProfileId) {
45-
return new AutoValue_RequestContext(
46-
instanceName.getProject(), instanceName.getInstance(), appProfileId);
47-
}
48-
4941
/** The project id that the client is configured to target. */
5042
public abstract String getProjectId();
5143

5244
/** The instance id that the client is configured to target. */
5345
public abstract String getInstanceId();
5446

55-
/**
56-
* The instance that the client is configured to target.
57-
*
58-
* @deprecated Please use {@link #getProjectId()} and {@link #getInstanceId()}.
59-
*/
60-
@Deprecated
61-
public com.google.cloud.bigtable.data.v2.models.InstanceName getInstanceName() {
62-
return com.google.cloud.bigtable.data.v2.models.InstanceName.of(
63-
getProjectId(), getInstanceId());
64-
}
65-
6647
/** The App Profile to use when processing the current request */
6748
public abstract String getAppProfileId();
6849
}

0 commit comments

Comments
 (0)