[beam] branch master updated: Revert "Merge pull request #14365 from [BEAM-10884] - Adding tests to PubSubTableProviderIT to test proto support"

[pabloem]

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new be6cb51  Revert "Merge pull request #14365 from [BEAM-10884] - Adding 
tests to PubSubTableProviderIT to test proto support"
     new f717477  Merge pull request #14505 from [BEAM-12146] Revert #14365 to 
fix SQL PostCommit
be6cb51 is described below

commit be6cb514d9cd6f7242c9b7a3fd4f0f63f9b4bbcb
Author: Brian Hulette <bhule...@google.com>
AuthorDate: Fri Apr 9 17:58:22 2021 -0700

    Revert "Merge pull request #14365 from [BEAM-10884] - Adding tests to 
PubSubTableProviderIT to test proto support"
    
    This reverts commit 18244773f4ff91a015b3756ace25cf7884acb15d.
---
 .../protobuf/src/test/proto/payload_messages.proto | 23 ---------
 .../provider/pubsub/PubsubTableProviderIT.java     | 55 +---------------------
 2 files changed, 1 insertion(+), 77 deletions(-)

diff --git 
a/sdks/java/extensions/protobuf/src/test/proto/payload_messages.proto 
b/sdks/java/extensions/protobuf/src/test/proto/payload_messages.proto
index 0e4e8e5..1486ee8 100644
--- a/sdks/java/extensions/protobuf/src/test/proto/payload_messages.proto
+++ b/sdks/java/extensions/protobuf/src/test/proto/payload_messages.proto
@@ -42,26 +42,3 @@ message SimpleMessage {
   int32 id = 1;
   string name = 2;
 }
-
-message NameMessage {
-  string name = 1;
-
-  enum NameType {
-    FIRST = 0;
-    MIDDLE = 1;
-    LAST = 2;
-    SECOND_LAST = 3;
-  }
-  repeated NameType name_array = 2;
-}
-
-message NameHeightMessage {
-  string name = 1;
-  int32 height = 2;
-}
-
-message NameHeightKnowsJSMessage {
-  string name = 1;
-  int32 height = 2;
-  bool knowsJs = 3;
-}
diff --git 
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubTableProviderIT.java
 
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubTableProviderIT.java
index a401373..a90f8e8 100644
--- 
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubTableProviderIT.java
+++ 
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/pubsub/PubsubTableProviderIT.java
@@ -49,7 +49,6 @@ import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.generic.GenericRecordBuilder;
 import org.apache.beam.sdk.coders.AvroCoder;
 import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
-import org.apache.beam.sdk.extensions.protobuf.PayloadMessages;
 import org.apache.beam.sdk.extensions.sql.impl.BeamSqlEnv;
 import org.apache.beam.sdk.extensions.sql.impl.JdbcConnection;
 import org.apache.beam.sdk.extensions.sql.impl.JdbcDriver;
@@ -106,11 +105,7 @@ public class PubsubTableProviderIT implements Serializable 
{
   @Parameters
   public static Collection<Object[]> data() {
     return Arrays.asList(
-        new Object[][] {
-          {new PubsubJsonObjectProvider()},
-          {new PubsubAvroObjectProvider()},
-          {new PubsubProtoObjectProvider()}
-        });
+        new Object[][] {{new PubsubJsonObjectProvider()}, {new 
PubsubAvroObjectProvider()}});
   }
 
   @Parameter public PubsubObjectProvider objectsProvider;
@@ -786,54 +781,6 @@ public class PubsubTableProviderIT implements Serializable 
{
         throws Exception;
   }
 
-  private static class PubsubProtoObjectProvider extends PubsubObjectProvider {
-
-    @Override
-    protected String getPayloadFormat() {
-      return "proto";
-    }
-
-    @Override
-    protected PubsubMessage messageIdName(Instant timestamp, int id, String 
name) {
-      PayloadMessages.SimpleMessage.Builder simpleMessage =
-          PayloadMessages.SimpleMessage.newBuilder();
-
-      simpleMessage.setId(id);
-      simpleMessage.setName(name);
-
-      return PubsubTableProviderIT.message(
-          timestamp,
-          simpleMessage.build().toByteArray(),
-          ImmutableMap.of(name, Integer.toString(id)));
-    }
-
-    @Override
-    protected Matcher<PubsubMessage> matcherNames(String name) throws 
IOException {
-
-      PayloadMessages.NameMessage.Builder nameMessage = 
PayloadMessages.NameMessage.newBuilder();
-
-      return hasProperty("payload", 
equalTo(nameMessage.build().toByteArray()));
-    }
-
-    @Override
-    protected Matcher<PubsubMessage> matcherNameHeightKnowsJS(
-        String name, int height, boolean knowsJS) throws IOException {
-
-      PayloadMessages.NameHeightKnowsJSMessage.Builder 
nameHeightKnowsJSMessage =
-          PayloadMessages.NameHeightKnowsJSMessage.newBuilder();
-
-      return hasProperty("payload", 
equalTo(nameHeightKnowsJSMessage.build().toByteArray()));
-    }
-
-    @Override
-    protected Matcher<PubsubMessage> matcherNameHeight(String name, int 
height) throws IOException {
-      PayloadMessages.NameHeightMessage.Builder nameHeightMEssage =
-          PayloadMessages.NameHeightMessage.newBuilder();
-
-      return hasProperty("payload", 
equalTo(nameHeightMEssage.build().toByteArray()));
-    }
-  }
-
   private static class PubsubJsonObjectProvider extends PubsubObjectProvider {
 
     // Pubsub table provider should default to json