diff --git a/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/resources/streaming/WSQueryEndpointTest.java b/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/resources/streaming/WSQueryEndpointTest.java index 06242ad58c89..88271ace7baf 100644 --- a/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/resources/streaming/WSQueryEndpointTest.java +++ b/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/resources/streaming/WSQueryEndpointTest.java @@ -353,7 +353,7 @@ public void shouldReturnErrorOnInvalidStreamProperty() throws Exception { // Given: final String jsonRequest = "{" + "\"ksql\":\"sql\"," - + "\"configOverrides\":{" + + "\"streamsProperties\":{" + "\"unknown-property\":true" + "}}"; diff --git a/ksql-rest-client/src/test/java/io/confluent/ksql/rest/client/KsqlClientUtilTest.java b/ksql-rest-client/src/test/java/io/confluent/ksql/rest/client/KsqlClientUtilTest.java index cc8b749a52cf..fd633177232c 100644 --- a/ksql-rest-client/src/test/java/io/confluent/ksql/rest/client/KsqlClientUtilTest.java +++ b/ksql-rest-client/src/test/java/io/confluent/ksql/rest/client/KsqlClientUtilTest.java @@ -178,7 +178,7 @@ public void shouldSerialiseDeserialise() { // Then: assertThat(buff, is(notNullValue())); - String expectedJson = "{\"ksql\":\"some ksql\",\"configOverrides\":{\"auto.offset.reset\":\"" + String expectedJson = "{\"ksql\":\"some ksql\",\"streamsProperties\":{\"auto.offset.reset\":\"" + "latest\"},\"requestProperties\":{},\"commandSequenceNumber\":21345}"; assertThat(new JsonObject(buff), is(new JsonObject(expectedJson))); diff --git a/ksql-rest-model/src/main/java/io/confluent/ksql/rest/entity/KsqlRequest.java b/ksql-rest-model/src/main/java/io/confluent/ksql/rest/entity/KsqlRequest.java index 5b15fb66b827..4fd580e973c4 100644 --- a/ksql-rest-model/src/main/java/io/confluent/ksql/rest/entity/KsqlRequest.java +++ b/ksql-rest-model/src/main/java/io/confluent/ksql/rest/entity/KsqlRequest.java @@ -44,7 +44,7 @@ public class KsqlRequest { @JsonCreator public KsqlRequest( @JsonProperty("ksql") final String ksql, - @JsonProperty("configOverrides") final Map configOverrides, + @JsonProperty("streamsProperties") final Map configOverrides, @JsonProperty("requestProperties") final Map requestProperties, @JsonProperty("commandSequenceNumber") final Long commandSequenceNumber ) { @@ -62,6 +62,7 @@ public String getKsql() { return ksql; } + @JsonProperty("streamsProperties") public Map getConfigOverrides() { return coerceTypes(configOverrides); } diff --git a/ksql-rest-model/src/test/java/io/confluent/ksql/rest/entity/KsqlRequestTest.java b/ksql-rest-model/src/test/java/io/confluent/ksql/rest/entity/KsqlRequestTest.java index fc1dd5de6d71..a8d13b8a85d3 100644 --- a/ksql-rest-model/src/test/java/io/confluent/ksql/rest/entity/KsqlRequestTest.java +++ b/ksql-rest-model/src/test/java/io/confluent/ksql/rest/entity/KsqlRequestTest.java @@ -46,7 +46,7 @@ public class KsqlRequestTest { private static final ObjectMapper OBJECT_MAPPER = JsonMapper.INSTANCE.mapper; private static final String A_JSON_REQUEST = "{" + "\"ksql\":\"sql\"," - + "\"configOverrides\":{" + + "\"streamsProperties\":{" + "\"" + ConsumerConfig.AUTO_OFFSET_RESET_CONFIG + "\":\"earliest\"," + "\"" + StreamsConfig.DEFAULT_TIMESTAMP_EXTRACTOR_CLASS_CONFIG + "\":\"" + TimestampExtractor.class.getCanonicalName() + "\"" @@ -56,7 +56,7 @@ public class KsqlRequestTest { + "}}"; private static final String A_JSON_REQUEST_WITH_COMMAND_NUMBER = "{" + "\"ksql\":\"sql\"," - + "\"configOverrides\":{" + + "\"streamsProperties\":{" + "\"" + ConsumerConfig.AUTO_OFFSET_RESET_CONFIG + "\":\"earliest\"," + "\"" + StreamsConfig.DEFAULT_TIMESTAMP_EXTRACTOR_CLASS_CONFIG + "\":\"" + TimestampExtractor.class.getCanonicalName() + "\"" @@ -67,7 +67,7 @@ public class KsqlRequestTest { + "\"commandSequenceNumber\":2}"; private static final String A_JSON_REQUEST_WITH_NULL_COMMAND_NUMBER = "{" + "\"ksql\":\"sql\"," - + "\"configOverrides\":{" + + "\"streamsProperties\":{" + "\"" + ConsumerConfig.AUTO_OFFSET_RESET_CONFIG + "\":\"earliest\"," + "\"" + StreamsConfig.DEFAULT_TIMESTAMP_EXTRACTOR_CLASS_CONFIG + "\":\"" + TimestampExtractor.class.getCanonicalName() + "\"" @@ -178,7 +178,7 @@ public void shouldHandleShortProperties() { // Given: final String jsonRequest = "{" + "\"ksql\":\"sql\"," - + "\"configOverrides\":{" + + "\"streamsProperties\":{" + "\"" + ConsumerConfig.AUTO_OFFSET_RESET_CONFIG + "\":\"earliest\"" + "}}";