Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove jackson dependency in ksql-rest-app. #369

Merged
merged 3 commits into from
Oct 17, 2017
Merged

remove jackson dependency in ksql-rest-app. #369

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68ed90e
remove jackson dependency in ksql-rest-app.
dguy Oct 12, 2017
512d9ec
add missng pom update
dguy Oct 12, 2017
2890e13
merge trunk
dguy Oct 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ksql-cli/src/test/java/io/confluent/ksql/CliTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ public static void setUp() throws Exception {
produceInputStream(orderDataProvider);
}


private static void produceInputStream(TestDataProvider dataProvider) throws Exception {
createKStream(dataProvider);
topicProducer.produceInputData(dataProvider);
Expand All @@ -131,7 +132,7 @@ private static void testListOrShowCommands() {
testListOrShow("tables", EMPTY_RESULT);
testListOrShow("queries", EMPTY_RESULT);
}

@AfterClass
public static void tearDown() throws Exception {
// If WARN NetworkClient:589 - Connection to node -1 could not be established. Broker may not be available.
Expand Down
2 changes: 1 addition & 1 deletion ksql-engine/src/main/java/io/confluent/ksql/structured/SchemaKStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public SchemaKStream select(final List<Pair<String, Expression>> expressionPairL
newColumns.add(columnValue);
} catch (Exception ex) {
log.error("Error calculating column with index " + i + " : " +
expressionPairList.get(i).getLeft());
expressionPairList.get(i).getLeft(), ex);
newColumns.add(null);
}
}
Expand Down
8 changes: 0 additions & 8 deletions ksql-rest-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@
<artifactId>ksql-engine</artifactId>
</dependency>

<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.2</version>
</dependency>


<dependency>
<groupId>io.confluent</groupId>
<artifactId>kafka-json-serializer</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions ksql-rest-app/src/main/java/io/confluent/ksql/rest/entity/PropertiesList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonUnwrapped;

import java.util.Map;
import java.util.Objects;
Expand All @@ -37,7 +36,6 @@ public PropertiesList(
this.properties = properties;
}

@JsonUnwrapped
public Map<String, Object> getProperties() {
return properties;
}
Expand Down
4 changes: 2 additions & 2 deletions ksql-rest-app/src/main/java/io/confluent/ksql/rest/entity/StreamsList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import io.confluent.ksql.metastore.KsqlStream;

import java.util.ArrayList;
Expand All @@ -30,6 +29,7 @@

@JsonTypeName("streams")
public class StreamsList extends KsqlEntity {

private final Collection<StreamInfo> streams;

@JsonCreator
Expand All @@ -50,7 +50,7 @@ public static StreamsList fromKsqlStreams(
return new StreamsList(statementText, streamInfos);
}

@JsonUnwrapped

public List<StreamInfo> getStreams() {
return new ArrayList<>(streams);
}
Expand Down
2 changes: 0 additions & 2 deletions ksql-rest-app/src/main/java/io/confluent/ksql/rest/entity/TablesList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import io.confluent.ksql.metastore.KsqlTable;

import java.util.ArrayList;
Expand Down Expand Up @@ -47,7 +46,6 @@ public static TablesList fromKsqlTables(String statementText, Collection<KsqlTab
return new TablesList(statementText, tableInfos);
}

@JsonUnwrapped
public List<TableInfo> getTables() {
return new ArrayList<>(tables);
}
Expand Down