Releasing 3.1

README.md

@@ -1,9 +1,9 @@
 Welcome to project Druidry!
 =======================================
 
-![build_status](https://api.travis-ci.org/zapr-oss/druidry.svg?branch=master) [![License: Apache License 2](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.txt)
+![build_status](https://api.travis-ci.org/zapr-oss/druidry.svg?branch=master) [![License: Apache License 2](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.txt) [![javadoc](https://javadoc.io/badge2/in.zapr.druid/druidry/javadoc.svg)](https://javadoc.io/doc/in.zapr.druid/druidry)
 
-Druid is an extremely popular tool to perform OLAP queries on event data. Druid drives real-time dashboards in most of the organisations right now. We@Zapr love Druid! Therefore we want to contribute towards making Druid, even more, friendlier to the ever expanding community. 
+Druid is an extremely popular tool to perform OLAP queries on event data. Druid drives real-time dashboards in most of the organisations right now. We@Zapr love Druid! Therefore we want to contribute towards making Druid, even more, friendlier to the ever expanding community.
 
 We want to make the process of deep meaningful conversations with Druid little easier. What do we mean is that we don’t want developers to write big, scary JSON anymore but instead use a simple Java-based query generator to help with the querying. 
 
@@ -269,4 +269,4 @@ Contact
 
 For any features or bugs, please raise it in issues section
 
-If anything else, get in touch with us at [[email protected]]([email protected])
+If anything else, get in touch with us at [[email protected]]([email protected])

pom.xml

@@ -6,7 +6,7 @@
 
  <groupId>in.zapr.druid</groupId>
  <artifactId>druidry</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
 
  <name>Druidry - Druid Java Client</name>
  <description>Druidry is an open-source Java based utility library which supports creating
@@ -16,7 +16,7 @@
 
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jackson.databind.version>2.9.10.1</jackson.databind.version>
+ <jackson.databind.version>2.9.10.4</jackson.databind.version>
  <jackson.datatype.version>2.9.9</jackson.datatype.version>
  <jodatime.version>2.9.7</jodatime.version>
  <lombok.version>1.18.10</lombok.version>

src/main/java/in/zapr/druid/druidry/aggregator/DoubleMaxAggregator.java

@@ -16,20 +16,43 @@
 
 package in.zapr.druid.druidry.aggregator;
 
+import com.google.common.base.Preconditions;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 
 @Getter
 @EqualsAndHashCode(callSuper = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class DoubleMaxAggregator extends DruidAggregator {
 
  private static final String DOUBLE_MAX_TYPE_AGGREGATOR = "doubleMax";
+
  private String fieldName;
+ private String expression;
 
+ @Deprecated
  public DoubleMaxAggregator(@NonNull String name, @NonNull String fieldName) {
  this.type = DOUBLE_MAX_TYPE_AGGREGATOR;
  this.name = name;
  this.fieldName = fieldName;
  }
-}
+
+ @Builder
+ private DoubleMaxAggregator(@NonNull String name, String fieldName, String expression) {
+ this.type = DOUBLE_MAX_TYPE_AGGREGATOR;
+ this.name = name;
+ this.fieldName = fieldName;
+ this.expression = expression;
+
+ Preconditions.checkArgument(
+ fieldName == null ^ expression == null,
+ "Must have a valid, non-null fieldName or expression"
+ );
+ }
+
+}

src/main/java/in/zapr/druid/druidry/aggregator/DoubleMinAggregator.java

@@ -16,20 +16,43 @@
 
 package in.zapr.druid.druidry.aggregator;
 
+import com.google.common.base.Preconditions;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 
 @Getter
 @EqualsAndHashCode(callSuper = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class DoubleMinAggregator extends DruidAggregator {
 
  private static final String DOUBLE_MIN_TYPE_AGGREGATOR = "doubleMin";
+
  private String fieldName;
+ private String expression;
 
+ @Deprecated
  public DoubleMinAggregator(@NonNull String name, @NonNull String fieldName) {
  this.type = DOUBLE_MIN_TYPE_AGGREGATOR;
  this.name = name;
  this.fieldName = fieldName;
  }
-}
+
+ @Builder
+ private DoubleMinAggregator(@NonNull String name, String fieldName, String expression) {
+ this.type = DOUBLE_MIN_TYPE_AGGREGATOR;
+ this.name = name;
+ this.fieldName = fieldName;
+ this.expression = expression;
+
+ Preconditions.checkArgument(
+ fieldName == null ^ expression == null,
+ "Must have a valid, non-null fieldName or expression"
+ );
+ }
+
+}

src/main/java/in/zapr/druid/druidry/aggregator/DoubleSumAggregator.java

@@ -16,20 +16,43 @@
 
 package in.zapr.druid.druidry.aggregator;
 
+import com.google.common.base.Preconditions;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 
 @Getter
 @EqualsAndHashCode(callSuper = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class DoubleSumAggregator extends DruidAggregator {
 
  private static final String DOUBLE_SUM_TYPE_AGGREGATOR = "doubleSum";
+
  private String fieldName;
+ private String expression;
 
+ @Deprecated
  public DoubleSumAggregator(@NonNull String name, @NonNull String fieldName) {
  this.type = DOUBLE_SUM_TYPE_AGGREGATOR;
  this.name = name;
  this.fieldName = fieldName;
  }
-}
+
+ @Builder
+ private DoubleSumAggregator(@NonNull String name, String fieldName, String expression) {
+ this.type = DOUBLE_SUM_TYPE_AGGREGATOR;
+ this.name = name;
+ this.fieldName = fieldName;
+ this.expression = expression;
+
+ Preconditions.checkArgument(
+ fieldName == null ^ expression == null,
+ "Must have a valid, non-null fieldName or expression"
+ );
+ }
+
+}

src/main/java/in/zapr/druid/druidry/aggregator/HyperUniqueAggregator.java

@@ -16,20 +16,34 @@
 
 package in.zapr.druid.druidry.aggregator;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 
 @Getter
 @EqualsAndHashCode(callSuper = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class HyperUniqueAggregator extends DruidAggregator {
 
  private static final String HYPER_UNIQUE_TYPE_AGGREGATOR = "hyperUnique";
  private String fieldName;
+ private Boolean round;
 
+ @Deprecated
  public HyperUniqueAggregator(@NonNull String name, @NonNull String fieldName) {
  this.type = HYPER_UNIQUE_TYPE_AGGREGATOR;
  this.name = name;
  this.fieldName = fieldName;
  }
+
+ @Builder
+ private HyperUniqueAggregator(@NonNull String name, @NonNull String fieldName, Boolean round) {
+ this.type = HYPER_UNIQUE_TYPE_AGGREGATOR;
+ this.name = name;
+ this.fieldName = fieldName;
+ this.round = round;
+ }
 }

src/main/java/in/zapr/druid/druidry/aggregator/LongMaxAggregator.java

@@ -16,19 +16,43 @@
 
 package in.zapr.druid.druidry.aggregator;
 
+import com.google.common.base.Preconditions;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 
 @Getter
 @EqualsAndHashCode(callSuper = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LongMaxAggregator extends DruidAggregator {
+
  private static final String LONG_MAX_TYPE_AGGREGATOR = "longMax";
+
  private String fieldName;
+ private String expression;
 
+ @Deprecated
  public LongMaxAggregator(@NonNull String name, @NonNull String fieldName) {
  this.type = LONG_MAX_TYPE_AGGREGATOR;
  this.name = name;
  this.fieldName = fieldName;
  }
+
+ @Builder
+ private LongMaxAggregator(@NonNull String name, String fieldName, String expression) {
+ this.type = LONG_MAX_TYPE_AGGREGATOR;
+ this.name = name;
+ this.fieldName = fieldName;
+ this.expression = expression;
+
+ Preconditions.checkArgument(
+ fieldName == null ^ expression == null,
+ "Must have a valid, non-null fieldName or expression"
+ );
+ }
+
 }

src/main/java/in/zapr/druid/druidry/aggregator/LongMinAggregator.java

@@ -16,20 +16,43 @@
 
 package in.zapr.druid.druidry.aggregator;
 
+import com.google.common.base.Preconditions;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 
 @Getter
 @EqualsAndHashCode(callSuper = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LongMinAggregator extends DruidAggregator {
 
  private static final String LONG_MIN_TYPE_AGGREGATOR = "longMin";
+
  private String fieldName;
+ private String expression;
 
+ @Deprecated
  public LongMinAggregator(@NonNull String name, @NonNull String fieldName) {
  this.type = LONG_MIN_TYPE_AGGREGATOR;
  this.name = name;
  this.fieldName = fieldName;
  }
-}
+
+ @Builder
+ private LongMinAggregator(@NonNull String name, String fieldName, String expression) {
+ this.type = LONG_MIN_TYPE_AGGREGATOR;
+ this.name = name;
+ this.fieldName = fieldName;
+ this.expression = expression;
+
+ Preconditions.checkArgument(
+ fieldName == null ^ expression == null,
+ "Must have a valid, non-null fieldName or expression"
+ );
+ }
+
+}

src/main/java/in/zapr/druid/druidry/aggregator/LongSumAggregator.java

@@ -16,20 +16,43 @@
 
 package in.zapr.druid.druidry.aggregator;
 
+import com.google.common.base.Preconditions;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 
 @Getter
 @EqualsAndHashCode(callSuper = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LongSumAggregator extends DruidAggregator {
 
  private static final String LONGSUM_TYPE_AGGREGATOR = "longSum";
+
  private String fieldName;
+ private String expression;
 
+ @Deprecated
  public LongSumAggregator(@NonNull String name, @NonNull String fieldName) {
  this.type = LONGSUM_TYPE_AGGREGATOR;
  this.name = name;
  this.fieldName = fieldName;
  }
+
+ @Builder
+ private LongSumAggregator(@NonNull String name, String fieldName, String expression) {
+ this.type = LONGSUM_TYPE_AGGREGATOR;
+ this.name = name;
+ this.fieldName = fieldName;
+ this.expression = expression;
+
+ Preconditions.checkArgument(
+ fieldName == null ^ expression == null,
+ "Must have a valid, non-null fieldName or expression"
+ );
+ }
+
 }

src/main/java/in/zapr/druid/druidry/aggregator/StringFirstAggregator.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018-present Red Brick Lane Marketing Solutions Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package in.zapr.druid.druidry.aggregator;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NonNull;
+
+@Getter
+@EqualsAndHashCode(callSuper = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class StringFirstAggregator extends DruidAggregator {
+
+ private static final String STRING_FIRST_TYPE = "stringFirst";
+
+ private String fieldName;
+ private Integer maxStringBytes;
+
+ @Builder
+ private StringFirstAggregator(@NonNull String name, @NonNull String fieldName,
+ Integer maxStringBytes) {
+ this.type = STRING_FIRST_TYPE;
+ this.name = name;
+ this.fieldName = fieldName;
+ this.maxStringBytes = maxStringBytes;
+ }
+
+}