diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java index 6dc97d53b7..82ca5c9dfb 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandlerUtils.java @@ -672,7 +672,7 @@ static int getIntegerProperty(Table table, String propertyName, int defaultVal) } @Nullable public static List getListProperty(Table table, String propertyName) { - List rv = new ArrayList(); + List rv = new ArrayList<>(); String values = getTableProperty(table, propertyName); if(values == null) { return null; diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/json/AvroBytesDecoder.java druid-handler/src/java/org/apache/hadoop/hive/druid/json/AvroBytesDecoder.java index 3a1dbf7229..5f1a87ffd5 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/json/AvroBytesDecoder.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/json/AvroBytesDecoder.java @@ -20,9 +20,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.apache.avro.generic.GenericRecord; -import java.nio.ByteBuffer; /** * This class is copied from druid source code diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/json/AvroStreamInputRowParser.java druid-handler/src/java/org/apache/hadoop/hive/druid/json/AvroStreamInputRowParser.java index d6e6624669..8c2067ca65 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/json/AvroStreamInputRowParser.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/json/AvroStreamInputRowParser.java @@ -25,6 +25,7 @@ import io.druid.data.input.InputRow; import io.druid.data.input.impl.ParseSpec; +import javax.validation.constraints.NotNull; import java.nio.ByteBuffer; import java.util.List; import java.util.Objects; @@ -48,7 +49,7 @@ public AvroStreamInputRowParser( this.avroBytesDecoder = Preconditions.checkNotNull(avroBytesDecoder, "avroBytesDecoder"); } - @Override + @NotNull @Override public List parseBatch(ByteBuffer input) { throw new UnsupportedOperationException("This class is only used for JSON serde"); diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/json/KafkaSupervisorIOConfig.java druid-handler/src/java/org/apache/hadoop/hive/druid/json/KafkaSupervisorIOConfig.java index c1b3bf8d41..fba591792d 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/json/KafkaSupervisorIOConfig.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/json/KafkaSupervisorIOConfig.java @@ -43,8 +43,10 @@ private final Duration period; private final boolean useEarliestOffset; private final Duration completionTimeout; - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") private final Optional lateMessageRejectionPeriod; - @SuppressWarnings("OptionalUsedAsFieldOrParameterType") private final Optional earlyMessageRejectionPeriod; + @SuppressWarnings({ "OptionalUsedAsFieldOrParameterType", "Guava" }) private final Optional + lateMessageRejectionPeriod; + @SuppressWarnings({ "OptionalUsedAsFieldOrParameterType", "Guava" }) private final Optional + earlyMessageRejectionPeriod; private final boolean skipOffsetGaps; @JsonCreator public KafkaSupervisorIOConfig(@JsonProperty("topic") String topic, @@ -71,10 +73,12 @@ this.period = defaultDuration(period, "PT30S"); this.useEarliestOffset = useEarliestOffset != null ? useEarliestOffset : false; this.completionTimeout = defaultDuration(completionTimeout, "PT30M"); + //noinspection Guava this.lateMessageRejectionPeriod = lateMessageRejectionPeriod == null ? Optional.absent() : Optional.of(lateMessageRejectionPeriod.toStandardDuration()); + //noinspection Guava this.earlyMessageRejectionPeriod = earlyMessageRejectionPeriod == null ? Optional.absent() : @@ -118,11 +122,11 @@ return completionTimeout; } - @JsonProperty public Optional getEarlyMessageRejectionPeriod() { + @SuppressWarnings("Guava") @JsonProperty public Optional getEarlyMessageRejectionPeriod() { return earlyMessageRejectionPeriod; } - @JsonProperty public Optional getLateMessageRejectionPeriod() { + @SuppressWarnings("Guava") @JsonProperty public Optional getLateMessageRejectionPeriod() { return lateMessageRejectionPeriod; }