|
29 | 29 | import com.google.bigtable.v2.Type.Timestamp; |
30 | 30 | import com.google.bigtable.v2.Value; |
31 | 31 | import com.google.cloud.Date; |
| 32 | +import com.google.cloud.bigtable.common.Type.SchemalessEnum; |
| 33 | +import com.google.cloud.bigtable.common.Type.SchemalessProto; |
32 | 34 | import com.google.cloud.bigtable.data.v2.models.sql.ColumnMetadata; |
33 | 35 | import com.google.cloud.bigtable.data.v2.models.sql.ResultSet; |
34 | 36 | import com.google.cloud.bigtable.data.v2.models.sql.SqlType; |
35 | | -import com.google.cloud.bigtable.common.Type.SchemalessProto; |
36 | | -import com.google.cloud.bigtable.common.Type.SchemalessEnum; |
37 | 37 | import com.google.cloud.bigtable.data.v2.models.sql.StructReader; |
38 | 38 | import com.google.protobuf.ByteString; |
39 | 39 | import java.time.Instant; |
@@ -235,14 +235,21 @@ private static Type toProtoType(SqlType<?> type) { |
235 | 235 | case PROTO: |
236 | 236 | SchemalessProto protoType = (SchemalessProto) type; |
237 | 237 | return Type.newBuilder() |
238 | | - .setProtoType(Proto.newBuilder().setMessageName(protoType.getMessageName()) |
239 | | - .setSchemaBundleId(protoType.schemaBundleId()).build()).build(); |
| 238 | + .setProtoType( |
| 239 | + Proto.newBuilder() |
| 240 | + .setMessageName(protoType.getMessageName()) |
| 241 | + .setSchemaBundleId(protoType.schemaBundleId()) |
| 242 | + .build()) |
| 243 | + .build(); |
240 | 244 | case ENUM: |
241 | 245 | SchemalessEnum enumType = (SchemalessEnum) type; |
242 | 246 | return Type.newBuilder() |
243 | 247 | .setEnumType( |
244 | | - com.google.bigtable.v2.Type.Enum.newBuilder().setEnumName(enumType.getEnumName()) |
245 | | - .setSchemaBundleId(enumType.schemaBundleId()).build()).build(); |
| 248 | + com.google.bigtable.v2.Type.Enum.newBuilder() |
| 249 | + .setEnumName(enumType.getEnumName()) |
| 250 | + .setSchemaBundleId(enumType.schemaBundleId()) |
| 251 | + .build()) |
| 252 | + .build(); |
246 | 253 | default: |
247 | 254 | throw new IllegalStateException("Unexpected Type: " + type); |
248 | 255 | } |
|
0 commit comments