Skip to content

Commit 9514cf8

Browse files
jinseopkim0jinseopkim0
committed
refactor(bigtable-samples): import V2 classes to shorten fully qualified names
1 parent ee45f5d commit 9514cf8

7 files changed

Lines changed: 96 additions & 92 deletions

File tree

‎java-bigtable/samples/snippets/src/main/java/com/example/bigtable/AuthorizedViewExample.java‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@
2121
import com.google.api.gax.rpc.NotFoundException;
2222
import com.google.api.gax.rpc.PermissionDeniedException;
2323
import com.google.api.gax.rpc.ServerStream;
24+
import com.google.bigtable.admin.v2.AuthorizedView;
25+
import com.google.bigtable.admin.v2.AuthorizedViewName;
26+
import com.google.bigtable.admin.v2.ColumnFamily;
27+
import com.google.bigtable.admin.v2.CreateAuthorizedViewRequest;
28+
import com.google.bigtable.admin.v2.CreateTableRequest;
29+
import com.google.bigtable.admin.v2.GetTableRequest;
30+
import com.google.bigtable.admin.v2.ListAuthorizedViewsRequest;
31+
import com.google.bigtable.admin.v2.Table;
32+
import com.google.bigtable.admin.v2.UpdateAuthorizedViewRequest;
2433
import com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminSettings;
2534
import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClientV2;
2635
import com.google.cloud.bigtable.data.v2.BigtableDataClient;
@@ -90,9 +99,9 @@ public AuthorizedViewExample(
9099
private boolean exists(String tableId) {
91100
try {
92101
adminClient.getTable(
93-
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
102+
GetTableRequest.newBuilder()
94103
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
95-
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
104+
.setView(Table.View.NAME_ONLY)
96105
.build());
97106
return true;
98107
} catch (com.google.api.gax.rpc.NotFoundException e) {
@@ -123,18 +132,16 @@ public void createTable() {
123132
// Checks if table exists, creates table if it does not exist.
124133
if (!exists(tableId)) {
125134
System.out.println("Table does not exist, creating table: " + tableId);
126-
com.google.bigtable.admin.v2.CreateTableRequest request =
127-
com.google.bigtable.admin.v2.CreateTableRequest.newBuilder()
135+
CreateTableRequest request =
136+
CreateTableRequest.newBuilder()
128137
.setParent("projects/" + projectId + "/instances/" + instanceId)
129138
.setTableId(tableId)
130139
.setTable(
131-
com.google.bigtable.admin.v2.Table.newBuilder()
132-
.putColumnFamilies(
133-
COLUMN_FAMILY,
134-
com.google.bigtable.admin.v2.ColumnFamily.getDefaultInstance())
140+
Table.newBuilder()
141+
.putColumnFamilies(COLUMN_FAMILY, ColumnFamily.getDefaultInstance())
135142
.build())
136143
.build();
137-
com.google.bigtable.admin.v2.Table table = adminClient.createTable(request);
144+
Table table = adminClient.createTable(request);
138145
System.out.printf("Table: %s created successfully%n", table.getName());
139146
}
140147
}
@@ -170,29 +177,26 @@ public void createAuthorizedView() {
170177
System.out.printf("%nCreating authorized view %s in table %s%n", authorizedViewId, tableId);
171178
// [START bigtable_create_authorized_view]
172179
try {
173-
com.google.bigtable.admin.v2.AuthorizedView.SubsetView subsetView =
174-
com.google.bigtable.admin.v2.AuthorizedView.SubsetView.newBuilder()
180+
AuthorizedView.SubsetView subsetView =
181+
AuthorizedView.SubsetView.newBuilder()
175182
.addRowPrefixes(com.google.protobuf.ByteString.EMPTY)
176183
.putFamilySubsets(
177184
COLUMN_FAMILY,
178-
com.google.bigtable.admin.v2.AuthorizedView.FamilySubsets.newBuilder()
185+
AuthorizedView.FamilySubsets.newBuilder()
179186
.addQualifierPrefixes(
180187
com.google.protobuf.ByteString.copyFromUtf8(COLUMN_QUALIFIER_NAME))
181188
.build())
182189
.build();
183-
com.google.bigtable.admin.v2.AuthorizedView authorizedViewObj =
184-
com.google.bigtable.admin.v2.AuthorizedView.newBuilder()
185-
.setSubsetView(subsetView)
186-
.build();
187-
com.google.bigtable.admin.v2.CreateAuthorizedViewRequest request =
188-
com.google.bigtable.admin.v2.CreateAuthorizedViewRequest.newBuilder()
190+
AuthorizedView authorizedViewObj =
191+
AuthorizedView.newBuilder().setSubsetView(subsetView).build();
192+
CreateAuthorizedViewRequest request =
193+
CreateAuthorizedViewRequest.newBuilder()
189194
.setParent(
190195
"projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
191196
.setAuthorizedViewId(authorizedViewId)
192197
.setAuthorizedView(authorizedViewObj)
193198
.build();
194-
com.google.bigtable.admin.v2.AuthorizedView authorizedView =
195-
adminClient.createAuthorizedViewAsync(request).get();
199+
AuthorizedView authorizedView = adminClient.createAuthorizedViewAsync(request).get();
196200
System.out.printf("AuthorizedView: %s created successfully%n", authorizedView.getName());
197201
} catch (Exception e) {
198202
System.err.println("Failed to create an authorized view: " + e.getMessage());
@@ -207,17 +211,17 @@ public void updateAuthorizedView() {
207211
// [START bigtable_update_authorized_view]
208212
try {
209213
// Update to an authorized view permitting everything.
210-
com.google.bigtable.admin.v2.AuthorizedView.SubsetView subsetView =
211-
com.google.bigtable.admin.v2.AuthorizedView.SubsetView.newBuilder()
214+
AuthorizedView.SubsetView subsetView =
215+
AuthorizedView.SubsetView.newBuilder()
212216
.addRowPrefixes(com.google.protobuf.ByteString.EMPTY)
213217
.putFamilySubsets(
214218
COLUMN_FAMILY,
215-
com.google.bigtable.admin.v2.AuthorizedView.FamilySubsets.newBuilder()
219+
AuthorizedView.FamilySubsets.newBuilder()
216220
.addQualifierPrefixes(com.google.protobuf.ByteString.EMPTY)
217221
.build())
218222
.build();
219-
com.google.bigtable.admin.v2.AuthorizedView authorizedViewObj =
220-
com.google.bigtable.admin.v2.AuthorizedView.newBuilder()
223+
AuthorizedView authorizedViewObj =
224+
AuthorizedView.newBuilder()
221225
.setSubsetView(subsetView)
222226
.setName(
223227
"projects/"
@@ -229,14 +233,13 @@ public void updateAuthorizedView() {
229233
+ "/authorizedViews/"
230234
+ authorizedViewId)
231235
.build();
232-
com.google.bigtable.admin.v2.UpdateAuthorizedViewRequest request =
233-
com.google.bigtable.admin.v2.UpdateAuthorizedViewRequest.newBuilder()
236+
UpdateAuthorizedViewRequest request =
237+
UpdateAuthorizedViewRequest.newBuilder()
234238
.setAuthorizedView(authorizedViewObj)
235239
.setUpdateMask(
236240
com.google.protobuf.FieldMask.newBuilder().addPaths("subset_view").build())
237241
.build();
238-
com.google.bigtable.admin.v2.AuthorizedView authorizedView =
239-
adminClient.updateAuthorizedViewAsync(request).get();
242+
AuthorizedView authorizedView = adminClient.updateAuthorizedViewAsync(request).get();
240243
System.out.printf("AuthorizedView: %s updated successfully%n", authorizedView.getName());
241244
} catch (Exception e) {
242245
System.err.println("Failed to modify authorized view: " + e.getMessage());
@@ -245,10 +248,10 @@ public void updateAuthorizedView() {
245248
}
246249

247250
/** Demonstrates how to get an authorized view's metadata. */
248-
public com.google.bigtable.admin.v2.AuthorizedView getAuthorizedView() {
251+
public AuthorizedView getAuthorizedView() {
249252
System.out.printf("%nGetting authorized view %s in table %s%n", authorizedViewId, tableId);
250253
// [START bigtable_get_authorized_view]
251-
com.google.bigtable.admin.v2.AuthorizedView authorizedView = null;
254+
AuthorizedView authorizedView = null;
252255
try {
253256
authorizedView =
254257
adminClient.getAuthorizedView(
@@ -260,13 +263,12 @@ public com.google.bigtable.admin.v2.AuthorizedView getAuthorizedView() {
260263
+ tableId
261264
+ "/authorizedViews/"
262265
+ authorizedViewId);
263-
com.google.bigtable.admin.v2.AuthorizedView.SubsetView subsetView =
264-
authorizedView.getSubsetView();
266+
AuthorizedView.SubsetView subsetView = authorizedView.getSubsetView();
265267

266268
for (ByteString rowPrefix : subsetView.getRowPrefixesList()) {
267269
System.out.printf("Row Prefix: %s%n", rowPrefix.toStringUtf8());
268270
}
269-
for (Map.Entry<String, com.google.bigtable.admin.v2.AuthorizedView.FamilySubsets> entry :
271+
for (Map.Entry<String, AuthorizedView.FamilySubsets> entry :
270272
subsetView.getFamilySubsetsMap().entrySet()) {
271273
for (ByteString qualifierPrefix : entry.getValue().getQualifierPrefixesList()) {
272274
System.out.printf(
@@ -292,16 +294,13 @@ public List<String> listAllAuthorizedViews() {
292294
// [START bigtable_list_authorized_views]
293295
List<String> authorizedViewIds = new ArrayList<>();
294296
try {
295-
com.google.bigtable.admin.v2.ListAuthorizedViewsRequest request =
296-
com.google.bigtable.admin.v2.ListAuthorizedViewsRequest.newBuilder()
297+
ListAuthorizedViewsRequest request =
298+
ListAuthorizedViewsRequest.newBuilder()
297299
.setParent(
298300
"projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
299301
.build();
300-
for (com.google.bigtable.admin.v2.AuthorizedView view :
301-
adminClient.listAuthorizedViews(request).iterateAll()) {
302-
String id =
303-
com.google.bigtable.admin.v2.AuthorizedViewName.parse(view.getName())
304-
.getAuthorizedView();
302+
for (AuthorizedView view : adminClient.listAuthorizedViews(request).iterateAll()) {
303+
String id = AuthorizedViewName.parse(view.getName()).getAuthorizedView();
305304
System.out.println(id);
306305
authorizedViewIds.add(id);
307306
}

‎java-bigtable/samples/snippets/src/main/java/com/example/bigtable/HelloWorld.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222

2323
import com.google.api.gax.rpc.NotFoundException;
2424
import com.google.api.gax.rpc.ServerStream;
25+
import com.google.bigtable.admin.v2.ColumnFamily;
26+
import com.google.bigtable.admin.v2.CreateTableRequest;
27+
import com.google.bigtable.admin.v2.GetTableRequest;
28+
import com.google.bigtable.admin.v2.Table;
2529
import com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminSettings;
2630
import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClientV2;
2731
import com.google.cloud.bigtable.data.v2.BigtableDataClient;
@@ -123,9 +127,9 @@ public void createTable() {
123127
boolean exists = false;
124128
try {
125129
adminClient.getTable(
126-
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
130+
GetTableRequest.newBuilder()
127131
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
128-
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
132+
.setView(Table.View.NAME_ONLY)
129133
.build());
130134
exists = true;
131135
} catch (NotFoundException e) {
@@ -134,15 +138,13 @@ public void createTable() {
134138
if (!exists) {
135139
System.out.println("Creating table: " + tableId);
136140
String parent = "projects/" + projectId + "/instances/" + instanceId;
137-
com.google.bigtable.admin.v2.CreateTableRequest request =
138-
com.google.bigtable.admin.v2.CreateTableRequest.newBuilder()
141+
CreateTableRequest request =
142+
CreateTableRequest.newBuilder()
139143
.setParent(parent)
140144
.setTableId(tableId)
141145
.setTable(
142-
com.google.bigtable.admin.v2.Table.newBuilder()
143-
.putColumnFamilies(
144-
COLUMN_FAMILY,
145-
com.google.bigtable.admin.v2.ColumnFamily.getDefaultInstance())
146+
Table.newBuilder()
147+
.putColumnFamilies(COLUMN_FAMILY, ColumnFamily.getDefaultInstance())
146148
.build())
147149
.build();
148150
adminClient.createTable(request);

‎java-bigtable/samples/snippets/src/main/java/com/example/bigtable/InstanceAdminExample.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public void createProdInstance(boolean createWithTags) {
124124
boolean exists = false;
125125
try {
126126
adminClient.getInstance(
127-
com.google.bigtable.admin.v2.GetInstanceRequest.newBuilder()
127+
GetInstanceRequest.newBuilder()
128128
.setName("projects/" + projectId + "/instances/" + instanceId)
129129
.build());
130130
exists = true;

‎java-bigtable/samples/snippets/src/main/java/com/example/bigtable/SchemaBundleExample.java‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@
1717
package com.example.bigtable;
1818

1919
import com.google.api.gax.rpc.NotFoundException;
20+
import com.google.bigtable.admin.v2.ColumnFamily;
21+
import com.google.bigtable.admin.v2.CreateSchemaBundleRequest;
22+
import com.google.bigtable.admin.v2.CreateTableRequest;
23+
import com.google.bigtable.admin.v2.GetTableRequest;
24+
import com.google.bigtable.admin.v2.ListSchemaBundlesRequest;
25+
import com.google.bigtable.admin.v2.ProtoSchema;
26+
import com.google.bigtable.admin.v2.SchemaBundle;
27+
import com.google.bigtable.admin.v2.SchemaBundleName;
28+
import com.google.bigtable.admin.v2.Table;
29+
import com.google.bigtable.admin.v2.UpdateSchemaBundleRequest;
2030
import com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminSettings;
2131
import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClientV2;
2232
import com.google.protobuf.ByteString;
@@ -85,9 +95,9 @@ public SchemaBundleExample(
8595
private boolean exists(String tableId) {
8696
try {
8797
adminClient.getTable(
88-
com.google.bigtable.admin.v2.GetTableRequest.newBuilder()
98+
GetTableRequest.newBuilder()
8999
.setName("projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
90-
.setView(com.google.bigtable.admin.v2.Table.View.NAME_ONLY)
100+
.setView(Table.View.NAME_ONLY)
91101
.build());
92102
return true;
93103
} catch (com.google.api.gax.rpc.NotFoundException e) {
@@ -114,18 +124,16 @@ public void createTable() {
114124
// Checks if table exists, creates table if it does not exist.
115125
if (!exists(tableId)) {
116126
System.out.println("Table does not exist, creating table: " + tableId);
117-
com.google.bigtable.admin.v2.CreateTableRequest request =
118-
com.google.bigtable.admin.v2.CreateTableRequest.newBuilder()
127+
CreateTableRequest request =
128+
CreateTableRequest.newBuilder()
119129
.setParent("projects/" + projectId + "/instances/" + instanceId)
120130
.setTableId(tableId)
121131
.setTable(
122-
com.google.bigtable.admin.v2.Table.newBuilder()
123-
.putColumnFamilies(
124-
COLUMN_FAMILY,
125-
com.google.bigtable.admin.v2.ColumnFamily.getDefaultInstance())
132+
Table.newBuilder()
133+
.putColumnFamilies(COLUMN_FAMILY, ColumnFamily.getDefaultInstance())
126134
.build())
127135
.build();
128-
com.google.bigtable.admin.v2.Table table = adminClient.createTable(request);
136+
Table table = adminClient.createTable(request);
129137
System.out.printf("Table: %s created successfully%n", table.getName());
130138
}
131139
}
@@ -162,22 +170,19 @@ public void createSchemaBundle() {
162170
if (in == null) {
163171
throw new java.io.FileNotFoundException("Resource not found: " + PROTO_FILE_PATH);
164172
}
165-
com.google.bigtable.admin.v2.SchemaBundle schemaBundleObj =
166-
com.google.bigtable.admin.v2.SchemaBundle.newBuilder()
173+
SchemaBundle schemaBundleObj =
174+
SchemaBundle.newBuilder()
167175
.setProtoSchema(
168-
com.google.bigtable.admin.v2.ProtoSchema.newBuilder()
169-
.setProtoDescriptors(ByteString.readFrom(in))
170-
.build())
176+
ProtoSchema.newBuilder().setProtoDescriptors(ByteString.readFrom(in)).build())
171177
.build();
172-
com.google.bigtable.admin.v2.CreateSchemaBundleRequest request =
173-
com.google.bigtable.admin.v2.CreateSchemaBundleRequest.newBuilder()
178+
CreateSchemaBundleRequest request =
179+
CreateSchemaBundleRequest.newBuilder()
174180
.setParent(
175181
"projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
176182
.setSchemaBundleId(schemaBundleId)
177183
.setSchemaBundle(schemaBundleObj)
178184
.build();
179-
com.google.bigtable.admin.v2.SchemaBundle schemaBundle =
180-
adminClient.createSchemaBundleAsync(request).get();
185+
SchemaBundle schemaBundle = adminClient.createSchemaBundleAsync(request).get();
181186
System.out.printf("Schema bundle: %s created successfully%n", schemaBundle.getName());
182187
} catch (Exception e) {
183188
System.err.println("Failed to create a schema bundle: " + e.getMessage());
@@ -194,8 +199,8 @@ public void updateSchemaBundle() {
194199
if (in == null) {
195200
throw new java.io.FileNotFoundException("Resource not found: " + PROTO_FILE_PATH);
196201
}
197-
com.google.bigtable.admin.v2.SchemaBundle schemaBundleObj =
198-
com.google.bigtable.admin.v2.SchemaBundle.newBuilder()
202+
SchemaBundle schemaBundleObj =
203+
SchemaBundle.newBuilder()
199204
.setName(
200205
"projects/"
201206
+ projectId
@@ -206,18 +211,15 @@ public void updateSchemaBundle() {
206211
+ "/schemaBundles/"
207212
+ schemaBundleId)
208213
.setProtoSchema(
209-
com.google.bigtable.admin.v2.ProtoSchema.newBuilder()
210-
.setProtoDescriptors(ByteString.readFrom(in))
211-
.build())
214+
ProtoSchema.newBuilder().setProtoDescriptors(ByteString.readFrom(in)).build())
212215
.build();
213-
com.google.bigtable.admin.v2.UpdateSchemaBundleRequest request =
214-
com.google.bigtable.admin.v2.UpdateSchemaBundleRequest.newBuilder()
216+
UpdateSchemaBundleRequest request =
217+
UpdateSchemaBundleRequest.newBuilder()
215218
.setSchemaBundle(schemaBundleObj)
216219
.setUpdateMask(
217220
com.google.protobuf.FieldMask.newBuilder().addPaths("proto_schema").build())
218221
.build();
219-
com.google.bigtable.admin.v2.SchemaBundle schemaBundle =
220-
adminClient.updateSchemaBundleAsync(request).get();
222+
SchemaBundle schemaBundle = adminClient.updateSchemaBundleAsync(request).get();
221223
System.out.printf("Schema bundle: %s updated successfully%n", schemaBundle.getName());
222224
} catch (Exception e) {
223225
System.err.println("Failed to modify schema bundle: " + e.getMessage());
@@ -226,10 +228,10 @@ public void updateSchemaBundle() {
226228
}
227229

228230
/** Demonstrates how to get a schema bundle's definition. */
229-
public com.google.bigtable.admin.v2.SchemaBundle getSchemaBundle() {
231+
public SchemaBundle getSchemaBundle() {
230232
System.out.printf("%nGetting schema bundle %s in table %s%n", schemaBundleId, tableId);
231233
// [START bigtable_get_schema_bundle]
232-
com.google.bigtable.admin.v2.SchemaBundle schemaBundle = null;
234+
SchemaBundle schemaBundle = null;
233235
try {
234236
schemaBundle =
235237
adminClient.getSchemaBundle(
@@ -273,15 +275,13 @@ public List<String> listAllSchemaBundles() {
273275
// [START bigtable_list_schema_bundles]
274276
List<String> schemaBundleIds = new ArrayList<>();
275277
try {
276-
com.google.bigtable.admin.v2.ListSchemaBundlesRequest request =
277-
com.google.bigtable.admin.v2.ListSchemaBundlesRequest.newBuilder()
278+
ListSchemaBundlesRequest request =
279+
ListSchemaBundlesRequest.newBuilder()
278280
.setParent(
279281
"projects/" + projectId + "/instances/" + instanceId + "/tables/" + tableId)
280282
.build();
281-
for (com.google.bigtable.admin.v2.SchemaBundle bundle :
282-
adminClient.listSchemaBundles(request).iterateAll()) {
283-
String id =
284-
com.google.bigtable.admin.v2.SchemaBundleName.parse(bundle.getName()).getSchemaBundle();
283+
for (SchemaBundle bundle : adminClient.listSchemaBundles(request).iterateAll()) {
284+
String id = SchemaBundleName.parse(bundle.getName()).getSchemaBundle();
285285
System.out.println(id);
286286
schemaBundleIds.add(id);
287287
}

0 commit comments

Comments
 (0)