From d1b13d85a73cb55c535b076c5d5009d4cd2b9212 Mon Sep 17 00:00:00 2001 From: Carlos Alonso Date: Thu, 28 Jun 2018 11:59:37 +0200 Subject: [PATCH] Simplifies BigQueryInsertError codification --- .../beam/sdk/io/gcp/bigquery/BigQueryInsertErrorCoder.java | 6 ++---- .../sdk/io/gcp/bigquery/BigQueryInsertErrorCoderTest.java | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryInsertErrorCoder.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryInsertErrorCoder.java index e08fda96398..f557a6c6baf 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryInsertErrorCoder.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryInsertErrorCoder.java @@ -44,8 +44,7 @@ public void encode(BigQueryInsertError value, OutputStream outStream) throws IOE TableRowJsonCoder.of().encode(value.getRow(), outStream); - String tableStrValue = MAPPER.writeValueAsString(value.getTable()); - StringUtf8Coder.of().encode(tableStrValue, outStream); + StringUtf8Coder.of().encode(BigQueryHelpers.toTableSpec(value.getTable()), outStream); } @Override @@ -54,8 +53,7 @@ public BigQueryInsertError decode(InputStream inStream) throws IOException { MAPPER.readValue( StringUtf8Coder.of().decode(inStream), TableDataInsertAllResponse.InsertErrors.class); TableRow row = TableRowJsonCoder.of().decode(inStream); - TableReference ref = - MAPPER.readValue(StringUtf8Coder.of().decode(inStream), TableReference.class); + TableReference ref = BigQueryHelpers.parseTableSpec(StringUtf8Coder.of().decode(inStream)); return new BigQueryInsertError(row, err, ref); } diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryInsertErrorCoderTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryInsertErrorCoderTest.java index 88bca5a32d2..7f755b390aa 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryInsertErrorCoderTest.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryInsertErrorCoderTest.java @@ -50,9 +50,9 @@ public void testDecodeEncodeEqual() throws Exception { .setMessage("A message") .setDebugInfo("The debug info"))), new TableReference() - .setProjectId("DummyProject") - .setDatasetId("DummyDataset") - .setTableId("table")); + .setProjectId("dummy-project-id") + .setDatasetId("dummy-dataset-id") + .setTableId("dummy-table-id")); CoderProperties.coderDecodeEncodeEqual(TEST_CODER, value); }