Merge remote-tracking branch 'apache/master' into upgrade-guice-to-5.x

benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java

@@ -68,15 +68,15 @@ public class FlattenJSONBenchmark
   public void prepare() throws Exception
   {
     FlattenJSONBenchmarkUtil gen = new FlattenJSONBenchmarkUtil();
-    flatInputs = new ArrayList<String>();
+    flatInputs = new ArrayList<>();
     for (int i = 0; i < NUM_EVENTS; i++) {
       flatInputs.add(gen.generateFlatEvent());
     }
-    nestedInputs = new ArrayList<String>();
+    nestedInputs = new ArrayList<>();
     for (int i = 0; i < NUM_EVENTS; i++) {
       nestedInputs.add(gen.generateNestedEvent());
     }
-    jqInputs = new ArrayList<String>();
+    jqInputs = new ArrayList<>();
     for (int i = 0; i < NUM_EVENTS; i++) {
       jqInputs.add(gen.generateNestedEvent()); // reuse the same event as "nested"
     }

benchmarks/src/test/java/org/apache/druid/benchmark/GenericIndexedBenchmark.java

@@ -67,7 +67,7 @@ public class GenericIndexedBenchmark
 
   public static final int ITERATIONS = 10000;
 
-  static final ObjectStrategy<byte[]> BYTE_ARRAY_STRATEGY = new ObjectStrategy<byte[]>()
+  static final ObjectStrategy<byte[]> BYTE_ARRAY_STRATEGY = new ObjectStrategy<>()
   {
     @Override
     public Class<byte[]> getClazz()

benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java

@@ -67,9 +67,9 @@ public class IncrementalIndexRowTypeBenchmark
   private static AggregatorFactory[] aggs;
   static final int DIMENSION_COUNT = 8;
 
-  private ArrayList<InputRow> longRows = new ArrayList<InputRow>();
-  private ArrayList<InputRow> floatRows = new ArrayList<InputRow>();
-  private ArrayList<InputRow> stringRows = new ArrayList<InputRow>();
+  private ArrayList<InputRow> longRows = new ArrayList<>();
+  private ArrayList<InputRow> floatRows = new ArrayList<>();
+  private ArrayList<InputRow> stringRows = new ArrayList<>();
 
 
   static {
@@ -95,7 +95,7 @@ public class IncrementalIndexRowTypeBenchmark
   private MapBasedInputRow getLongRow(long timestamp, int dimensionCount)
   {
     Random rng = ThreadLocalRandom.current();
-    List<String> dimensionList = new ArrayList<String>(dimensionCount);
+    List<String> dimensionList = new ArrayList<>(dimensionCount);
     ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     for (int i = 0; i < dimensionCount; i++) {
       String dimName = StringUtils.format("Dim_%d", i);
@@ -108,7 +108,7 @@ private MapBasedInputRow getLongRow(long timestamp, int dimensionCount)
   private MapBasedInputRow getFloatRow(long timestamp, int dimensionCount)
   {
     Random rng = ThreadLocalRandom.current();
-    List<String> dimensionList = new ArrayList<String>(dimensionCount);
+    List<String> dimensionList = new ArrayList<>(dimensionCount);
     ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     for (int i = 0; i < dimensionCount; i++) {
       String dimName = StringUtils.format("Dim_%d", i);
@@ -121,7 +121,7 @@ private MapBasedInputRow getFloatRow(long timestamp, int dimensionCount)
   private MapBasedInputRow getStringRow(long timestamp, int dimensionCount)
   {
     Random rng = ThreadLocalRandom.current();
-    List<String> dimensionList = new ArrayList<String>(dimensionCount);
+    List<String> dimensionList = new ArrayList<>(dimensionCount);
     ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     for (int i = 0; i < dimensionCount; i++) {
       String dimName = StringUtils.format("Dim_%d", i);

benchmarks/src/test/java/org/apache/druid/benchmark/StupidPoolConcurrencyBenchmark.java

@@ -44,7 +44,7 @@ public static class BenchmarkPool
     private final AtomicLong numPools = new AtomicLong(0L);
     private final NonBlockingPool<Object> pool = new StupidPool<>(
         "simpleObject pool",
-        new Supplier<Object>()
+        new Supplier<>()
         {
           @Override
           public Object get()

benchmarks/src/test/java/org/apache/druid/benchmark/indexing/OnheapIncrementalIndexBenchmark.java

@@ -116,7 +116,7 @@ public class OnheapIncrementalIndexBenchmark
 
   private static MapBasedInputRow getLongRow(long timestamp, int rowID, int dimensionCount)
   {
-    List<String> dimensionList = new ArrayList<String>(dimensionCount);
+    List<String> dimensionList = new ArrayList<>(dimensionCount);
     ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     for (int i = 0; i < dimensionCount; i++) {
       String dimName = StringUtils.format("Dim_%d", i);

benchmarks/src/test/java/org/apache/druid/benchmark/sequences/MergeSequenceBenchmark.java

@@ -80,14 +80,14 @@ public void setup()
   public void mergeHierarchical(Blackhole blackhole)
   {
     Iterator<Sequence<Integer>> iterator = sequences.iterator();
-    List<Sequence<Integer>> partialMerged = new ArrayList<Sequence<Integer>>();
-    List<Sequence<Integer>> toMerge = new ArrayList<Sequence<Integer>>();
+    List<Sequence<Integer>> partialMerged = new ArrayList<>();
+    List<Sequence<Integer>> toMerge = new ArrayList<>();
 
     while (iterator.hasNext()) {
       toMerge.add(iterator.next());
       if (toMerge.size() == mergeAtOnce) {
-        partialMerged.add(new MergeSequence<Integer>(Ordering.natural(), Sequences.simple(toMerge)));
-        toMerge = new ArrayList<Sequence<Integer>>();
+        partialMerged.add(new MergeSequence<>(Ordering.natural(), Sequences.simple(toMerge)));
+        toMerge = new ArrayList<>();
       }
     }
 

extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentMover.java

@@ -101,7 +101,7 @@ public DataSegment move(DataSegment segment, Map<String, Object> targetLoadSpec)
               .putAll(
                   Maps.filterKeys(
                       loadSpec,
-                      new Predicate<String>()
+                      new Predicate<>()
                       {
                         @Override
                         public boolean apply(String input)

extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentPuller.java

@@ -245,7 +245,7 @@ public boolean delete()
   public Predicate<Throwable> shouldRetryPredicate()
   {
     // Yay! smart retries!
-    return new Predicate<Throwable>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(Throwable e)

extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java

@@ -57,7 +57,7 @@ static boolean isServiceExceptionRecoverable(OSSException ex)
     return !badStatusCode && (isIOException || isTimeout);
   }
 
-  public static final Predicate<Throwable> RETRYABLE = new Predicate<Throwable>()
+  public static final Predicate<Throwable> RETRYABLE = new Predicate<>()
   {
     @Override
     public boolean apply(Throwable e)

extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraStorage.java

@@ -66,7 +66,7 @@ public CassandraStorage(CassandraDataSegmentConfig config)
     this.config = config;
     indexStorage = new CassandraChunkedStorageProvider(keyspace, INDEX_TABLE_NAME);
 
-    descriptorStorage = new ColumnFamily<String, String>(DESCRIPTOR_TABLE_NAME,
+    descriptorStorage = new ColumnFamily<>(DESCRIPTOR_TABLE_NAME,
         StringSerializer.get(), StringSerializer.get());
   }
 }

extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesUtils.java

@@ -31,7 +31,7 @@
 public class CloudFilesUtils
 {
 
-  public static final Predicate<Throwable> CLOUDFILESRETRY = new Predicate<Throwable>()
+  public static final Predicate<Throwable> CLOUDFILESRETRY = new Predicate<>()
   {
     @Override
     public boolean apply(Throwable e)

extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/CompressedBigDecimalMetricSerde.java

@@ -49,7 +49,7 @@ public String getTypeName()
   @Override
   public ComplexMetricExtractor<CompressedBigDecimal> getExtractor()
   {
-    return new ComplexMetricExtractor<CompressedBigDecimal>()
+    return new ComplexMetricExtractor<>()
     {
       @Override
       public Class<CompressedBigDecimal> extractedClass()

extensions-contrib/ddsketch/src/main/java/org/apache/druid/query/aggregation/ddsketch/DDSketchAggregatorFactory.java

@@ -264,7 +264,7 @@ public AggregatorFactory withName(String newName)
   @Override
   public AggregateCombiner<DDSketch> makeAggregateCombiner()
   {
-    return new ObjectAggregateCombiner<DDSketch>()
+    return new ObjectAggregateCombiner<>()
     {
       private DDSketch combined = DDSketches.collapsingLowestDense(relativeError, numBins);
 

extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java

@@ -60,7 +60,7 @@ public void setup()
   {
     pool = new CloseableStupidPool<>(
         "TopNQueryEngine-bufferPool",
-        new Supplier<ByteBuffer>()
+        new Supplier<>()
         {
           @Override
           public ByteBuffer get()

extensions-contrib/druid-deltalake-extensions/src/main/java/org/apache/druid/delta/input/DeltaInputSourceReader.java

@@ -68,7 +68,7 @@ public CloseableIterator<InputRowListPlusRawValues> sample()
   {
 
     CloseableIterator<InputRow> inner = read();
-    return new CloseableIterator<InputRowListPlusRawValues>()
+    return new CloseableIterator<>()
     {
       @Override
       public void close() throws IOException

extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java

@@ -91,7 +91,7 @@ public void testSerDeserKafkaEmitterConfigNullRequestTopic() throws IOException
   @Test
   public void testSerDeserKafkaEmitterConfigNullMetricsTopic() throws IOException
   {
-    Set<KafkaEmitterConfig.EventType> eventTypeSet = new HashSet<KafkaEmitterConfig.EventType>();
+    Set<KafkaEmitterConfig.EventType> eventTypeSet = new HashSet<>();
     eventTypeSet.add(KafkaEmitterConfig.EventType.SEGMENT_METADATA);
     KafkaEmitterConfig kafkaEmitterConfig = new KafkaEmitterConfig(
         "hostname",

extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java

@@ -603,7 +603,7 @@ public TaskLocation getLocation()
 
     runner.tasks.put(task.getId(), workItem);
 
-    ListenableFuture<InputStream> future = new ListenableFuture<InputStream>()
+    ListenableFuture<InputStream> future = new ListenableFuture<>()
     {
       @Override
       public void addListener(Runnable runnable, Executor executor)

extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSourceManager.java

@@ -219,7 +219,7 @@ private void updateDerivatives()
   private long getAvgSizePerGranularity(String datasource)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Long>() {
+        new HandleCallback<>() {
           Set<Interval> intervals = new HashSet<>();
           long totalSize = 0;
           @Override

extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewUtils.java

@@ -47,7 +47,7 @@ public class MaterializedViewUtils
    */
   public static Set<String> getRequiredFields(Query query)
   {
-    Set<String> dimsInFilter = null == query.getFilter() ? new HashSet<String>() : query.getFilter().getRequiredColumns();
+    Set<String> dimsInFilter = null == query.getFilter() ? new HashSet<>() : query.getFilter().getRequiredColumns();
     Set<String> dimensions = new HashSet<>(dimsInFilter);
 
     if (query instanceof TopNQuery) {

extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java

@@ -84,7 +84,7 @@ public QueryMetrics<? super MovingAverageQuery> makeMetrics(MovingAverageQuery q
   public Function<Row, Row> makePostComputeManipulatorFn(MovingAverageQuery query, MetricManipulationFn fn)
   {
 
-    return new Function<Row, Row>()
+    return new Function<>()
     {
 
       @Override
@@ -122,9 +122,7 @@ public Row apply(Row result)
   @Override
   public TypeReference<Row> getResultTypeReference()
   {
-    return new TypeReference<Row>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java

@@ -234,9 +234,7 @@ private Class<?> getExpectedQueryType()
 
   private TypeReference<List<MapBasedRow>> getExpectedResultType()
   {
-    return new TypeReference<List<MapBasedRow>>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   /**

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/BaseAveragerFactoryTest.java

@@ -33,7 +33,7 @@ public class BaseAveragerFactoryTest
   @Before
   public void setup()
   {
-    fac = new BaseAveragerFactory<Long, Long>("test", 5, "field", 1)
+    fac = new BaseAveragerFactory<>("test", 5, "field", 1)
     {
       @Override
       public Averager<Long> createAverager()

extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/IncrementalPublishingRabbitStreamIndexTaskRunner.java

@@ -135,8 +135,7 @@ protected boolean isEndOfShard(Long seqNum)
   @Override
   public TypeReference<List<SequenceMetadata<String, Long>>> getSequenceMetadataTypeReference()
   {
-    return new TypeReference<List<SequenceMetadata<String, Long>>>() {
-    };
+    return new TypeReference<>() {};
   }
 
   @Nullable
@@ -149,8 +148,8 @@ protected TreeMap<Integer, Map<String, Long>> getCheckPointsFromContext(
       log.debug("Got checkpoints from task context[%s].", checkpointsString);
       return toolbox.getJsonMapper().readValue(
           checkpointsString,
-          new TypeReference<TreeMap<Integer, Map<String, Long>>>() {
-          });
+          new TypeReference<>() {}
+      );
     } else {
       return null;
     }

extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/RabbitStreamRecordSupplier.java

@@ -112,7 +112,7 @@ public RabbitStreamRecordSupplier(
     // stateSemaphore protects isRunning and consumers
     stateSemaphore = new Semaphore(1, true);
     isRunning = false;
-    consumers = new ArrayList<Consumer>();
+    consumers = new ArrayList<>();
 
     this.password = null;
     this.username = null;
@@ -238,7 +238,7 @@ private void removeOldAssignments(Set<StreamPartition<String>> streamPartitionst
     Iterator<Map.Entry<String, ConsumerBuilder>> streamBuilderIterator = streamBuilders.entrySet().iterator();
     while (streamBuilderIterator.hasNext()) {
       Map.Entry<String, ConsumerBuilder> entry = streamBuilderIterator.next();
-      StreamPartition<String> comparitor = new StreamPartition<String>(getStreamFromSubstream(entry.getKey()), entry.getKey());
+      StreamPartition<String> comparitor = new StreamPartition<>(getStreamFromSubstream(entry.getKey()), entry.getKey());
       if (!streamPartitionstoKeep.contains(comparitor)) {
         streamBuilderIterator.remove();
       }
@@ -247,7 +247,7 @@ private void removeOldAssignments(Set<StreamPartition<String>> streamPartitionst
     Iterator<Map.Entry<String, OffsetSpecification>> offsetIterator = offsetMap.entrySet().iterator();
     while (offsetIterator.hasNext()) {
       Map.Entry<String, OffsetSpecification> entry = offsetIterator.next();
-      StreamPartition<String> comparitor = new StreamPartition<String>(getStreamFromSubstream(entry.getKey()), entry.getKey());
+      StreamPartition<String> comparitor = new StreamPartition<>(getStreamFromSubstream(entry.getKey()), entry.getKey());
       if (!streamPartitionstoKeep.contains(comparitor)) {
         offsetIterator.remove();
       }

extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisor.java

@@ -83,8 +83,7 @@
  */
 public class RabbitStreamSupervisor extends SeekableStreamSupervisor<String, Long, ByteEntity>
 {
-  public static final TypeReference<TreeMap<Integer, Map<String, Long>>> CHECKPOINTS_TYPE_REF = new TypeReference<TreeMap<Integer, Map<String, Long>>>() {
-  };
+  public static final TypeReference<TreeMap<Integer, Map<String, Long>>> CHECKPOINTS_TYPE_REF = new TypeReference<>() {};
 
   private static final EmittingLogger log = new EmittingLogger(RabbitStreamSupervisor.class);
   private static final Long NOT_SET = -1L;

extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/SpectatorHistogramTest.java

@@ -281,7 +281,7 @@ public void testSerializeAndDeserialize() throws IOException
     histogram.add(32, 4294967295L);
     histogram.add(33, 4294967296L);
 
-    ColumnValueSelector<SpectatorHistogram> selector = new ColumnValueSelector<SpectatorHistogram>()
+    ColumnValueSelector<SpectatorHistogram> selector = new ColumnValueSelector<>()
     {
       private int callCount = 0;
 

extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java

@@ -240,7 +240,7 @@ public Void insertOrUpdate(
       final byte[] value)
   {
     return getDBI().withHandle(
-        new HandleCallback<Void>()
+        new HandleCallback<>()
         {
           @Override
           public Void withHandle(Handle handle)

extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftDeserialization.java

@@ -39,7 +39,7 @@ public class ThriftDeserialization
   private static final Logger log = LoggerFactory.getLogger(ThriftDeserialization.class);
 
 
-  private static final ThreadLocal<TDeserializer> DESERIALIZER_COMPACT = new ThreadLocal<TDeserializer>()
+  private static final ThreadLocal<TDeserializer> DESERIALIZER_COMPACT = new ThreadLocal<>()
   {
     @Override
     protected TDeserializer initialValue()
@@ -48,7 +48,7 @@ protected TDeserializer initialValue()
     }
   };
 
-  private static final ThreadLocal<TDeserializer> DESERIALIZER_BINARY = new ThreadLocal<TDeserializer>()
+  private static final ThreadLocal<TDeserializer> DESERIALIZER_BINARY = new ThreadLocal<>()
   {
     @Override
     protected TDeserializer initialValue()
@@ -57,7 +57,7 @@ protected TDeserializer initialValue()
     }
   };
 
-  private static final ThreadLocal<TDeserializer> DESERIALIZER_JSON = new ThreadLocal<TDeserializer>()
+  private static final ThreadLocal<TDeserializer> DESERIALIZER_JSON = new ThreadLocal<>()
   {
     @Override
     protected TDeserializer initialValue()
@@ -66,7 +66,7 @@ protected TDeserializer initialValue()
     }
   };
 
-  public static final ThreadLocal<TSerializer> SERIALIZER_SIMPLE_JSON = new ThreadLocal<TSerializer>()
+  public static final ThreadLocal<TSerializer> SERIALIZER_SIMPLE_JSON = new ThreadLocal<>()
   {
     @Override
     protected TSerializer initialValue()

extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroOCFReader.java

@@ -92,7 +92,7 @@ protected CloseableIterator<GenericRecord> intermediateRowIterator() throws IOEx
       datumReader.setExpected(readerSchema);
       closer.register(dataFileReader);
 
-      return new CloseableIterator<GenericRecord>()
+      return new CloseableIterator<>()
       {
         @Override
         public boolean hasNext()