From e52da2562b4efb3a35c2ac1cdf92f776610fd7ed Mon Sep 17 00:00:00 2001 From: Jihoon Son Date: Fri, 9 Jun 2017 08:50:59 +0900 Subject: [PATCH 1/3] Add legacy constructor to CsvParseSpec --- .../java/io/druid/data/input/impl/CSVParseSpec.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java b/api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java index a4b09a2010a9..cc2de3c77101 100644 --- a/api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java +++ b/api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java @@ -68,6 +68,17 @@ public CSVParseSpec( } } + @Deprecated + public CSVParseSpec( + @JsonProperty("timestampSpec") TimestampSpec timestampSpec, + @JsonProperty("dimensionsSpec") DimensionsSpec dimensionsSpec, + @JsonProperty("listDelimiter") String listDelimiter, + @JsonProperty("columns") List columns + ) + { + this(timestampSpec, dimensionsSpec, listDelimiter, columns, false, 0); + } + @JsonProperty public String getListDelimiter() { From e726b620033321d3306c6572d741ecf059a26cc5 Mon Sep 17 00:00:00 2001 From: Jihoon Son Date: Fri, 9 Jun 2017 09:13:22 +0900 Subject: [PATCH 2/3] Remove JsonProperty annotations --- .../main/java/io/druid/data/input/impl/CSVParseSpec.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java b/api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java index cc2de3c77101..36a6b670fb7c 100644 --- a/api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java +++ b/api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java @@ -70,10 +70,10 @@ public CSVParseSpec( @Deprecated public CSVParseSpec( - @JsonProperty("timestampSpec") TimestampSpec timestampSpec, - @JsonProperty("dimensionsSpec") DimensionsSpec dimensionsSpec, - @JsonProperty("listDelimiter") String listDelimiter, - @JsonProperty("columns") List columns + TimestampSpec timestampSpec, + DimensionsSpec dimensionsSpec, + String listDelimiter, + List columns ) { this(timestampSpec, dimensionsSpec, listDelimiter, columns, false, 0); From 731f93b70b574b0162cc2d55f654879b98c904dc Mon Sep 17 00:00:00 2001 From: Jihoon Son Date: Fri, 9 Jun 2017 09:45:25 +0900 Subject: [PATCH 3/3] Add legacy constructor to DelimitedParseSpec --- .../io/druid/data/input/impl/DelimitedParseSpec.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/api/src/main/java/io/druid/data/input/impl/DelimitedParseSpec.java b/api/src/main/java/io/druid/data/input/impl/DelimitedParseSpec.java index c3383eb351c4..4facbca3e01c 100644 --- a/api/src/main/java/io/druid/data/input/impl/DelimitedParseSpec.java +++ b/api/src/main/java/io/druid/data/input/impl/DelimitedParseSpec.java @@ -71,6 +71,18 @@ public DelimitedParseSpec( } } + @Deprecated + public DelimitedParseSpec( + TimestampSpec timestampSpec, + DimensionsSpec dimensionsSpec, + String delimiter, + String listDelimiter, + List columns + ) + { + this(timestampSpec, dimensionsSpec, delimiter, listDelimiter, columns, false, 0); + } + @JsonProperty("delimiter") public String getDelimiter() {