more foo

confluentinc · Feb 8, 2020 · effd22c · effd22c
1 parent a787255
commit effd22c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/ksql-api/src/main/java/io/confluent/ksql/api/server/DelimitedQueryStreamResponseWriter.java b/ksql-api/src/main/java/io/confluent/ksql/api/server/DelimitedQueryStreamResponseWriter.java
@@ -55,7 +55,7 @@ public QueryStreamResponseWriter writeMetadata(final QueryResponseMetadata metaD
 
   @Override
   public QueryStreamResponseWriter writeRow(final GenericRow row) {
-    response.write(PojoCodec.serializeObject(row.getColumns()).appendString("\n"));
+    response.write(PojoCodec.serializeObject(row.values()).appendString("\n"));
     return this;
   }
 

diff --git a/ksql-api/src/main/java/io/confluent/ksql/api/server/JsonQueryStreamResponseWriter.java b/ksql-api/src/main/java/io/confluent/ksql/api/server/JsonQueryStreamResponseWriter.java
@@ -59,7 +59,7 @@ public QueryStreamResponseWriter writeMetadata(final QueryResponseMetadata metaD
 
   @Override
   public QueryStreamResponseWriter writeRow(final GenericRow row) {
-    writeBuffer(PojoCodec.serializeObject(row.getColumns()));
+    writeBuffer(PojoCodec.serializeObject(row.values()));
     return this;
   }
 

diff --git a/ksql-api/src/test/java/io/confluent/ksql/api/ApiTest.java b/ksql-api/src/test/java/io/confluent/ksql/api/ApiTest.java
@@ -984,7 +984,7 @@ private void setDefaultRowGenerator() {
         .toArray(String[]::new);
     List<GenericRow> rows = new ArrayList<>();
     for (JsonArray ja : DEFAULT_ROWS) {
-      rows.add(new GenericRow(ja.getList()));
+      rows.add(GenericRow.fromList(ja.getList()));
     }
     testEndpoints.setRowGeneratorFactory(
         () -> new ListRowGenerator(

diff --git a/ksql-api/src/test/java/io/confluent/ksql/api/BlockingQueryPublisherTest.java b/ksql-api/src/test/java/io/confluent/ksql/api/BlockingQueryPublisherTest.java
@@ -83,7 +83,7 @@ private GenericRow generateRow(long num) {
     l.add("foo" + num);
     l.add(num);
     l.add(num % 2 == 0);
-    return new GenericRow(l);
+    return GenericRow.fromList(l);
   }
 
   @Test

diff --git a/ksql-api/src/test/java/io/confluent/ksql/api/tck/BlockingQueryPublisherVerificationTest.java b/ksql-api/src/test/java/io/confluent/ksql/api/tck/BlockingQueryPublisherVerificationTest.java
@@ -64,7 +64,7 @@ private GenericRow generateRow(long num) {
     l.add("foo" + num);
     l.add(num);
     l.add(num % 2 == 0);
-    return new GenericRow(l);
+    return GenericRow.fromList(l);
   }
 
   private static class TestQueryHandle implements QueryHandle {

diff --git a/ksql-common/src/main/java/io/confluent/ksql/GenericRow.java b/ksql-common/src/main/java/io/confluent/ksql/GenericRow.java
@@ -42,6 +42,10 @@ public static GenericRow genericRow(final Object... columns) {
     return new GenericRow().appendAll(Arrays.asList(columns));
   }
 
+  public static GenericRow fromList(final List<Object> columns) {
+    return new GenericRow().appendAll(columns);
+  }
+
   /**
    * Ensure the row has enough capacity to hold {@code additionalCapacity} more elements than its
    * current size.

diff --git a/ksql-rest-app/src/test/java/io/confluent/ksql/rest/integration/NewApiTest.java b/ksql-rest-app/src/test/java/io/confluent/ksql/rest/integration/NewApiTest.java
@@ -41,7 +41,7 @@
 import io.confluent.ksql.integration.IntegrationTestHarness;
 import io.confluent.ksql.json.JsonMapper;
 import io.confluent.ksql.rest.server.TestKsqlRestApp;
-import io.confluent.ksql.serde.Format;
+import io.confluent.ksql.serde.FormatFactory;
 import io.confluent.ksql.test.util.EmbeddedSingleNodeKafkaCluster;
 import io.confluent.ksql.test.util.secure.ClientTrustStore;
 import io.confluent.ksql.test.util.secure.Credentials;
@@ -161,7 +161,7 @@ public class NewApiTest {
   public static void setUpClass() {
     TEST_HARNESS.ensureTopics(PAGE_VIEW_TOPIC);
 
-    TEST_HARNESS.produceRows(PAGE_VIEW_TOPIC, PAGE_VIEWS_PROVIDER, Format.JSON);
+    TEST_HARNESS.produceRows(PAGE_VIEW_TOPIC, PAGE_VIEWS_PROVIDER, FormatFactory.JSON);
 
     RestIntegrationTestUtil.createStream(REST_APP, PAGE_VIEWS_PROVIDER);