X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fsa%2Fsearchdbabstraction%2Fsearchapi%2FDateRangeAggregation.java;h=5851f9a05d42bea454862083b4b698f1ed2082df;hb=refs%2Fchanges%2F55%2F68455%2F1;hp=1ee42c9fde1ae668cd48a90edd38b039b8b4f9c2;hpb=71393bb2bf9fb10962723e61cf0e70d9aa202645;p=aai%2Fsearch-data-service.git diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java index 1ee42c9..5851f9a 100644 --- a/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java +++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/searchapi/DateRangeAggregation.java @@ -25,7 +25,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * An example of a date_range aggregation: * - *
+ *+ * + *
* { * "aggs": { * "range": { @@ -47,83 +49,83 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class DateRangeAggregation extends AbstractAggregation { - private String format; + private String format; - @JsonProperty("ranges") - private DateRange[] dateRanges; + @JsonProperty("ranges") + private DateRange[] dateRanges; - public String getFormat() { - return format; - } + public String getFormat() { + return format; + } + + public void setFormat(String format) { + this.format = format; + } - public void setFormat(String format) { - this.format = format; - } + public DateRange[] getDateRanges() { + return dateRanges; + } - public DateRange[] getDateRanges() { - return dateRanges; - } + public void setDateRanges(DateRange[] dateRanges) { + this.dateRanges = dateRanges; + } - public void setDateRanges(DateRange[] dateRanges) { - this.dateRanges = dateRanges; - } + @Override + public String toElasticSearch() { + StringBuilder sb = new StringBuilder(); - @Override - public String toElasticSearch() { - StringBuilder sb = new StringBuilder(); + sb.append("\"date_range\": {\"field\": \""); + sb.append(field); + sb.append("\""); - sb.append("\"date_range\": {\"field\": \""); - sb.append(field); - sb.append("\""); + if (format != null) { + sb.append(", \"format\": \""); + sb.append(format); + sb.append("\""); + } - if (format != null) { - sb.append(", \"format\": \""); - sb.append(format); - sb.append("\""); - } + if (dateRanges != null && dateRanges.length > 0) { + sb.append(", \"ranges\": ["); - if (dateRanges != null && dateRanges.length > 0) { - sb.append(", \"ranges\": ["); + for (int i = 0; i < dateRanges.length; i++) { + if (i > 0) { + sb.append(","); + } + sb.append(dateRanges[i].toElasticSearch()); + } - for (int i = 0; i < dateRanges.length; i++) { - if (i > 0) { - sb.append(","); + sb.append("]"); } - sb.append(dateRanges[i].toElasticSearch()); - } - sb.append("]"); - } + if (size != null) { + sb.append(", \"size\": "); + sb.append(size); + } - if (size != null) { - sb.append(", \"size\": "); - sb.append(size); - } + if (minThreshold != null) { + sb.append(", \"min_doc_count\": ").append(minThreshold); + } - if (minThreshold != null) { - sb.append(", \"min_doc_count\": ").append(minThreshold); - } + sb.append("}"); - sb.append("}"); - - return sb.toString(); - } - - @Override - public String toString() { - StringBuffer sb = new StringBuffer(); - sb.append("date-range: {field: " + field + ", format: " + format + ", size: " + size - + ", minThreshold: " + minThreshold + "ranges: ["); - for (int i = 0; i < dateRanges.length; i++) { - if (i > 0) { - sb.append(","); - } - sb.append(dateRanges[i].toString()); + return sb.toString(); } - sb.append("]"); - return sb.toString(); - } + @Override + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append("date-range: {field: " + field + ", format: " + format + ", size: " + size + ", minThreshold: " + + minThreshold + "ranges: ["); + for (int i = 0; i < dateRanges.length; i++) { + if (i > 0) { + sb.append(","); + } + sb.append(dateRanges[i].toString()); + } + sb.append("]"); + + return sb.toString(); + } }