handled file

Author: ron-gal

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/CreateSchemaBundleRequest.java

@@ -17,9 +17,16 @@
 package com.google.cloud.bigtable.admin.v2.models;
 
 import com.google.api.core.InternalApi;
+import com.google.bigtable.admin.v2.ProtoSchema;
 import com.google.cloud.bigtable.admin.v2.internal.NameUtil;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
+import com.google.protobuf.ByteString;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 import javax.annotation.Nonnull;
 
 /**
@@ -59,9 +66,14 @@ private CreateSchemaBundleRequest(@Nonnull String tableId, @Nonnull String schem
    *
    * @see SchemaBundleType for details.
    */
-  public CreateSchemaBundleRequest setProtoSchema(@Nonnull String protoFile) {
-    Preconditions.checkNotNull(protoFile, "protoSchema must be set");
-
+  public CreateSchemaBundleRequest setProtoSchema(@Nonnull String protoSchemaFile)
+      throws IOException {
+    Preconditions.checkNotNull(protoSchemaFile, "protoSchema must be set");
+    byte[] content = Files.readAllBytes(Paths.get(protoSchemaFile));
+    requestBuilder.setSchemaBundle(
+        com.google.bigtable.admin.v2.SchemaBundle.newBuilder()
+            .setProtoSchema(
+                ProtoSchema.newBuilder().setProtoDescriptors(ByteString.copyFrom(content))));
     return this;
   }
 

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/UpdateSchemaBundleRequest.java

@@ -17,11 +17,18 @@
 package com.google.cloud.bigtable.admin.v2.models;
 
 import com.google.api.core.InternalApi;
+import com.google.bigtable.admin.v2.ProtoSchema;
 import com.google.cloud.bigtable.admin.v2.internal.NameUtil;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
+import com.google.protobuf.ByteString;
 import com.google.protobuf.FieldMask;
 import com.google.protobuf.util.FieldMaskUtil;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 import javax.annotation.Nonnull;
 
 /**
@@ -74,8 +81,12 @@ private UpdateSchemaBundleRequest(
   }
 
   /** Changes the deletion protection of an existing schema bundle. */
-  public UpdateSchemaBundleRequest setProtoSchema(String protoSchemaFile) {
-    // requestBuilder.getSchemaBundleBuilder().setDeletionProtection(deletionProtection);
+  public UpdateSchemaBundleRequest setProtoSchema(String protoSchemaFile) throws IOException {
+    byte[] content = Files.readAllBytes(Paths.get(protoSchemaFile));
+    requestBuilder.setSchemaBundle(
+        com.google.bigtable.admin.v2.SchemaBundle.newBuilder()
+            .setProtoSchema(
+                ProtoSchema.newBuilder().setProtoDescriptors(ByteString.copyFrom(content))));
     updateFieldMask(com.google.bigtable.admin.v2.SchemaBundle.PROTO_SCHEMA_FIELD_NUMBER);
     return this;
   }

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

@@ -98,6 +98,8 @@
 import com.google.protobuf.util.Timestamps;
 import io.grpc.Status;
 import io.grpc.Status.Code;
+
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -1330,7 +1332,7 @@ public void testDeleteAuthorizedView() {
   }
 
   @Test
-  public void testCreateSchemaBundle() {
+  public void testCreateSchemaBundle() throws IOException {
     // Setup
     Mockito.when(mockStub.createSchemaBundleOperationCallable())
         .thenReturn(mockCreateSchemaBundleOperationCallable);
@@ -1375,7 +1377,7 @@ public void testCreateSchemaBundle() {
   }
 
   @Test
-  public void testUpdateSchemaBundle() {
+  public void testUpdateSchemaBundle() throws IOException {
     // Setup
     Mockito.when(mockStub.updateSchemaBundleOperationCallable())
         .thenReturn(mockUpdateSchemaBundleOperationCallable);

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

@@ -18,6 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import java.io.IOException;
+
 import com.google.cloud.bigtable.admin.v2.internal.NameUtil;
 import com.google.protobuf.ByteString;
 import org.junit.Test;
@@ -32,7 +34,7 @@ public class CreateSchemaBundleRequestTest {
   private static final String SCHEMA_BUNDLE_ID = "my-schema-bundle";
 
   @Test
-  public void testToProto() {
+  public void testToProto() throws IOException{
     CreateSchemaBundleRequest request =
         CreateSchemaBundleRequest.of(TABLE_ID, SCHEMA_BUNDLE_ID).setProtoSchema("file.pb");
 
@@ -52,7 +54,7 @@ public void testToProto() {
   }
 
   @Test
-  public void testEquality() {
+  public void testEquality() throws IOException{
     CreateSchemaBundleRequest request =
         CreateSchemaBundleRequest.of(TABLE_ID, SCHEMA_BUNDLE_ID).setProtoSchema("file.pb");
 
@@ -67,7 +69,7 @@ public void testEquality() {
   }
 
   @Test
-  public void testHashCode() {
+  public void testHashCode() throws IOException{
     CreateSchemaBundleRequest request =
         CreateSchemaBundleRequest.of(TABLE_ID, SCHEMA_BUNDLE_ID).setProtoSchema("file.pb");
 

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

@@ -18,6 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import java.io.IOException;
+
 import com.google.cloud.bigtable.admin.v2.internal.NameUtil;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.FieldMask;
@@ -33,7 +35,7 @@ public class UpdateSchemaBundleRequestTest {
   private static final String SCHEMA_BUNDLE_ID = "my-schema-bundle";
 
   @Test
-  public void testToProto() {
+  public void testToProto() throws IOException{
     UpdateSchemaBundleRequest request =
         UpdateSchemaBundleRequest.of(TABLE_ID, SCHEMA_BUNDLE_ID)
             .setProtoSchema("file.pb")
@@ -58,7 +60,7 @@ public void testToProto() {
   }
 
   @Test
-  public void testUpdateProtoSchema() {
+  public void testUpdateProtoSchema() throws IOException{
     com.google.bigtable.admin.v2.SchemaBundle existingSchemaBundle =
         com.google.bigtable.admin.v2.SchemaBundle.newBuilder()
             .setName(
@@ -83,7 +85,7 @@ public void testUpdateProtoSchema() {
   }
 
   @Test
-  public void testEquality() {
+  public void testEquality() throws IOException{
     UpdateSchemaBundleRequest request =
         UpdateSchemaBundleRequest.of(TABLE_ID, SCHEMA_BUNDLE_ID).setProtoSchema("file.pb");
 
@@ -98,7 +100,7 @@ public void testEquality() {
   }
 
   @Test
-  public void testHashCode() {
+  public void testHashCode()  throws IOException{
     UpdateSchemaBundleRequest request =
         UpdateSchemaBundleRequest.of(TABLE_ID, SCHEMA_BUNDLE_ID).setProtoSchema("file.pb");