diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java
index 7dd0c3fc9173..ee2b39bc941a 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java
+++ b/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"
     }
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/GenericIndexedBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/GenericIndexedBenchmark.java
index 6f699efe0264..afbcb97b19f8 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/GenericIndexedBenchmark.java
+++ b/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()
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java
index 395f9d6d7c70..e411fc92b1ed 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java
+++ b/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);
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/StupidPoolConcurrencyBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/StupidPoolConcurrencyBenchmark.java
index b7ed8eade071..8462a3cca58a 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/StupidPoolConcurrencyBenchmark.java
+++ b/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()
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/OnheapIncrementalIndexBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/OnheapIncrementalIndexBenchmark.java
index 7c67e7895ab5..8f662f273a34 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/OnheapIncrementalIndexBenchmark.java
+++ b/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);
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/sequences/MergeSequenceBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/sequences/MergeSequenceBenchmark.java
index 995163077e50..61bee5d59332 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/sequences/MergeSequenceBenchmark.java
+++ b/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<>();
       }
     }
 
diff --git a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentMover.java b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentMover.java
index eff024d3e0e9..0bfd3efaff57 100644
--- a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentMover.java
+++ b/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)
diff --git a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentPuller.java b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentPuller.java
index ebe9b2b49439..fa8e0193b052 100644
--- a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentPuller.java
+++ b/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)
diff --git a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java
index c9ec689eccaa..fa1b656f0aa9 100644
--- a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java
+++ b/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)
diff --git a/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraStorage.java b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraStorage.java
index 9588eb946fb5..de03b3476a2d 100644
--- a/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraStorage.java
+++ b/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());
   }
 }
diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesUtils.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesUtils.java
index bc883b28fd84..fe903b080230 100644
--- a/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesUtils.java
+++ b/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)
diff --git a/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/CompressedBigDecimalMetricSerde.java b/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/CompressedBigDecimalMetricSerde.java
index 1decd3df137a..d76896c83e09 100644
--- a/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/CompressedBigDecimalMetricSerde.java
+++ b/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()
diff --git a/extensions-contrib/ddsketch/src/main/java/org/apache/druid/query/aggregation/ddsketch/DDSketchAggregatorFactory.java b/extensions-contrib/ddsketch/src/main/java/org/apache/druid/query/aggregation/ddsketch/DDSketchAggregatorFactory.java
index 1081fdbd0ead..e70a7cc2c6cf 100644
--- a/extensions-contrib/ddsketch/src/main/java/org/apache/druid/query/aggregation/ddsketch/DDSketchAggregatorFactory.java
+++ b/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);
 
diff --git a/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java b/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java
index 7e3690cc1cb6..b54c9af1b2f7 100644
--- a/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java
+++ b/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()
diff --git a/extensions-contrib/druid-deltalake-extensions/src/main/java/org/apache/druid/delta/input/DeltaInputSourceReader.java b/extensions-contrib/druid-deltalake-extensions/src/main/java/org/apache/druid/delta/input/DeltaInputSourceReader.java
index 9ac7c253ef35..672a126f7c46 100644
--- a/extensions-contrib/druid-deltalake-extensions/src/main/java/org/apache/druid/delta/input/DeltaInputSourceReader.java
+++ b/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
diff --git a/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java b/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java
index 24b743a06611..0d5c5e312e84 100644
--- a/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java
+++ b/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",
diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
index a6c01ee306a5..756a4ad5a548 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
+++ b/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)
diff --git a/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSourceManager.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSourceManager.java
index 3cff0da0075a..82ad698d8bda 100644
--- a/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSourceManager.java
+++ b/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
diff --git a/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewUtils.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewUtils.java
index f28d67a62629..7c39b8fdc447 100644
--- a/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewUtils.java
+++ b/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) {
diff --git a/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java b/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java
index 8d28faaa251b..19492c4a0d51 100644
--- a/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java
+++ b/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
diff --git a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java b/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java
index 68668c9b3aa3..d86b6913cfb0 100644
--- a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java
+++ b/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<>() {};
   }
 
   /**
diff --git a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/BaseAveragerFactoryTest.java b/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/BaseAveragerFactoryTest.java
index 30d97c81eb30..6c43e2aa7f62 100644
--- a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/BaseAveragerFactoryTest.java
+++ b/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()
diff --git a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/IncrementalPublishingRabbitStreamIndexTaskRunner.java b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/IncrementalPublishingRabbitStreamIndexTaskRunner.java
index 9265d70f992c..75663d23063f 100644
--- a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/IncrementalPublishingRabbitStreamIndexTaskRunner.java
+++ b/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;
     }
diff --git a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/RabbitStreamRecordSupplier.java b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/RabbitStreamRecordSupplier.java
index 7488f76dfd92..56d7cf44ea1d 100644
--- a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/RabbitStreamRecordSupplier.java
+++ b/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();
       }
diff --git a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisor.java b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisor.java
index 5e9d3c3d2c6a..9ce9bd331cfc 100644
--- a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisor.java
+++ b/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;
diff --git a/extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/SpectatorHistogramTest.java b/extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/SpectatorHistogramTest.java
index 77b81f398477..ac0d59189dbd 100644
--- a/extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/SpectatorHistogramTest.java
+++ b/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;
 
diff --git a/extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java b/extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java
index 42787a0733cd..7b3c94f49926 100644
--- a/extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java
+++ b/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)
diff --git a/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftDeserialization.java b/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftDeserialization.java
index 90b802788499..956d9f3c8ce7 100644
--- a/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftDeserialization.java
+++ b/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()
diff --git a/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroOCFReader.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroOCFReader.java
index 012e2e801a0d..a071f38abb76 100644
--- a/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroOCFReader.java
+++ b/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()
diff --git a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroStreamInputRowParserTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroStreamInputRowParserTest.java
index f0cfd372cb84..a7ad60b13064 100644
--- a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroStreamInputRowParserTest.java
+++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroStreamInputRowParserTest.java
@@ -136,7 +136,7 @@ public class AvroStreamInputRowParserTest
   private static final List<CharSequence> SOME_STRING_ARRAY_VALUE = Arrays.asList("8", "4", "2", "1", null);
   private static final List<Integer> SOME_INT_ARRAY_VALUE = Arrays.asList(1, 2, 4, 8);
   static final Map<CharSequence, Integer> SOME_INT_VALUE_MAP_VALUE = Maps.asMap(
-      new HashSet<>(Arrays.asList("8", "2", "4", "1")), new Function<CharSequence, Integer>()
+      new HashSet<>(Arrays.asList("8", "2", "4", "1")), new Function<>()
       {
         @Nonnull
         @Override
@@ -147,7 +147,7 @@ public Integer apply(@Nullable CharSequence input)
       }
   );
   static final Map<CharSequence, CharSequence> SOME_STRING_VALUE_MAP_VALUE = Maps.asMap(
-      new HashSet<>(Arrays.asList("8", "2", "4", "1")), new Function<CharSequence, CharSequence>()
+      new HashSet<>(Arrays.asList("8", "2", "4", "1")), new Function<>()
       {
         @Nonnull
         @Override
@@ -429,7 +429,7 @@ static void assertInputRowCorrect(InputRow inputRow, List<String> expectedDimens
                     .on(",")
                     .withKeyValueSeparator("=")
                     .split(BRACES_AND_SPACE.matcher(inputRow.getDimension("someIntValueMap").get(0)).replaceAll("")),
-                new Function<String, Integer>()
+                new Function<>()
                 {
                   @Nullable
                   @Override
diff --git a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFInputFormatTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFInputFormatTest.java
index ceb394b0b3b3..c5caaa387ca2 100644
--- a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFInputFormatTest.java
+++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFInputFormatTest.java
@@ -87,9 +87,7 @@ public void testSerdeNonDefaults() throws Exception
                        + "  ]\n"
                        + "}";
 
-    TypeReference<Map<String, Object>> typeRef = new TypeReference<Map<String, Object>>()
-    {
-    };
+    TypeReference<Map<String, Object>> typeRef = new TypeReference<>() {};
     final Map<String, Object> readerSchema = jsonMapper.readValue(schemaStr, typeRef);
     AvroOCFInputFormat inputFormat = new AvroOCFInputFormat(
         jsonMapper,
diff --git a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFReaderTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFReaderTest.java
index b00c1e4ad7a1..9ee52c2ce43d 100644
--- a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFReaderTest.java
+++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFReaderTest.java
@@ -84,9 +84,7 @@ public void testParseWithReaderSchema() throws Exception
                        + "  ]\n"
                        + "}";
 
-    TypeReference<Map<String, Object>> typeRef = new TypeReference<Map<String, Object>>()
-    {
-    };
+    TypeReference<Map<String, Object>> typeRef = new TypeReference<>() {};
     final Map<String, Object> readerSchema = mapper.readValue(schemaStr, typeRef);
 
     final InputEntityReader reader = createReader(mapper, readerSchema);
@@ -114,9 +112,7 @@ public void testParseWithReaderSchemaAlias() throws Exception
                        + "  ]\n"
                        + "}";
 
-    TypeReference<Map<String, Object>> typeRef = new TypeReference<Map<String, Object>>()
-    {
-    };
+    TypeReference<Map<String, Object>> typeRef = new TypeReference<>() {};
     final Map<String, Object> readerSchema = mapper.readValue(schemaStr, typeRef);
 
     final InputEntityReader reader = createReader(mapper, readerSchema);
diff --git a/extensions-core/azure-extensions/src/main/java/org/apache/druid/storage/azure/output/AzureStorageConnector.java b/extensions-core/azure-extensions/src/main/java/org/apache/druid/storage/azure/output/AzureStorageConnector.java
index 2d6276c5a6d8..bc762ebea2cc 100644
--- a/extensions-core/azure-extensions/src/main/java/org/apache/druid/storage/azure/output/AzureStorageConnector.java
+++ b/extensions-core/azure-extensions/src/main/java/org/apache/druid/storage/azure/output/AzureStorageConnector.java
@@ -86,7 +86,7 @@ public ChunkingStorageConnectorParameters<AzureInputRange> buildInputParams(Stri
         objectPath(path)
     ));
     parameters.objectOpenFunction(
-        new ObjectOpenFunction<AzureInputRange>()
+        new ObjectOpenFunction<>()
         {
           @Override
           public InputStream open(AzureInputRange inputRange) throws IOException
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchAggregatorFactory.java
index 267953e23647..8ceedd6c5980 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchAggregatorFactory.java
@@ -158,7 +158,7 @@ public VectorAggregator factorizeVector(VectorColumnSelectorFactory selectorFact
   {
     return ColumnProcessors.makeVectorProcessor(
         getFieldName(),
-        new VectorColumnProcessorFactory<VectorAggregator>()
+        new VectorColumnProcessorFactory<>()
         {
           @Override
           public VectorAggregator makeSingleValueDimensionProcessor(
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchMergeAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchMergeAggregatorFactory.java
index dbcd34b26c6c..5598a9646248 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchMergeAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchMergeAggregatorFactory.java
@@ -59,7 +59,7 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory)
   {
     final ColumnValueSelector<KllDoublesSketch> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpAggregator<KllDoublesSketch>(KllDoublesSketchOperations.EMPTY_SKETCH);
+      return new KllSketchNoOpAggregator<>(KllDoublesSketchOperations.EMPTY_SKETCH);
     }
     return getMergeAggregator(selector);
   }
@@ -69,7 +69,7 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact
   {
     final ColumnValueSelector<KllDoublesSketch> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpBufferAggregator<KllDoublesSketch>(KllDoublesSketchOperations.EMPTY_SKETCH);
+      return new KllSketchNoOpBufferAggregator<>(KllDoublesSketchOperations.EMPTY_SKETCH);
     }
     return getMergeBufferAggregator(selector);
   }
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchAggregatorFactory.java
index bdd672ab1257..e60d2541d568 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchAggregatorFactory.java
@@ -158,7 +158,7 @@ public VectorAggregator factorizeVector(VectorColumnSelectorFactory selectorFact
   {
     return ColumnProcessors.makeVectorProcessor(
         getFieldName(),
-        new VectorColumnProcessorFactory<VectorAggregator>()
+        new VectorColumnProcessorFactory<>()
         {
           @Override
           public VectorAggregator makeSingleValueDimensionProcessor(
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchMergeAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchMergeAggregatorFactory.java
index e1b0c2d6244c..c1b470ea1739 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchMergeAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchMergeAggregatorFactory.java
@@ -59,7 +59,7 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory)
   {
     final ColumnValueSelector<KllFloatsSketch> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpAggregator<KllFloatsSketch>(KllFloatsSketchOperations.EMPTY_SKETCH);
+      return new KllSketchNoOpAggregator<>(KllFloatsSketchOperations.EMPTY_SKETCH);
     }
     return getMergeAggregator(selector);
   }
@@ -69,7 +69,7 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact
   {
     final ColumnValueSelector<KllFloatsSketch> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpBufferAggregator<KllFloatsSketch>(KllFloatsSketchOperations.EMPTY_SKETCH);
+      return new KllSketchNoOpBufferAggregator<>(KllFloatsSketchOperations.EMPTY_SKETCH);
     }
     return getMergeBufferAggregator(selector);
   }
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchAggregatorFactory.java
index 04b6d2d23031..98b46511f062 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchAggregatorFactory.java
@@ -80,13 +80,13 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory)
         && metricFactory.getColumnCapabilities(fieldName).isNumeric()) {
       final ColumnValueSelector<ValueType> selector = metricFactory.makeColumnValueSelector(fieldName);
       if (selector instanceof NilColumnValueSelector) {
-        return new KllSketchNoOpAggregator<SketchType>(getEmptySketch());
+        return new KllSketchNoOpAggregator<>(getEmptySketch());
       }
       return getBuildAggregator(selector);
     }
     final ColumnValueSelector<SketchType> selector = metricFactory.makeColumnValueSelector(fieldName);
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpAggregator<SketchType>(getEmptySketch());
+      return new KllSketchNoOpAggregator<>(getEmptySketch());
     }
     return getMergeAggregator(selector);
   }
@@ -98,13 +98,13 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact
         && metricFactory.getColumnCapabilities(fieldName).isNumeric()) {
       final ColumnValueSelector<ValueType> selector = metricFactory.makeColumnValueSelector(fieldName);
       if (selector instanceof NilColumnValueSelector) {
-        return new KllSketchNoOpBufferAggregator<SketchType>(getEmptySketch());
+        return new KllSketchNoOpBufferAggregator<>(getEmptySketch());
       }
       return getBuildBufferAggregator(selector);
     }
     final ColumnValueSelector<SketchType> selector = metricFactory.makeColumnValueSelector(fieldName);
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpBufferAggregator<SketchType>(getEmptySketch());
+      return new KllSketchNoOpBufferAggregator<>(getEmptySketch());
     }
     return getMergeBufferAggregator(selector);
   }
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchMergeAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchMergeAggregatorFactory.java
index 86b9b507e0ae..9e9d2a98d34a 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchMergeAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchMergeAggregatorFactory.java
@@ -53,7 +53,7 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory)
   {
     final ColumnValueSelector<SketchType> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpAggregator<SketchType>(getEmptySketch());
+      return new KllSketchNoOpAggregator<>(getEmptySketch());
     }
     return getMergeAggregator(selector);
   }
@@ -63,7 +63,7 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact
   {
     final ColumnValueSelector<SketchType> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpBufferAggregator<SketchType>(getEmptySketch());
+      return new KllSketchNoOpBufferAggregator<>(getEmptySketch());
     }
     return getMergeBufferAggregator(selector);
   }
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java
index acdef51178fd..2d8751515426 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java
@@ -170,7 +170,7 @@ public VectorAggregator factorizeVector(VectorColumnSelectorFactory selectorFact
   {
     return ColumnProcessors.makeVectorProcessor(
         fieldName,
-        new VectorColumnProcessorFactory<VectorAggregator>()
+        new VectorColumnProcessorFactory<>()
         {
           @Override
           public VectorAggregator makeSingleValueDimensionProcessor(
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
index 0d1ac2f1becf..c9229042763a 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
@@ -52,7 +52,7 @@ public class SketchHolder
   );
 
   public static final Comparator<Object> COMPARATOR = Ordering.from(
-      new Comparator<Object>()
+      new Comparator<>()
       {
         @Override
         public int compare(Object o1, Object o2)
@@ -81,7 +81,7 @@ public int compare(Object o1, Object o2)
       }
   ).nullsFirst();
 
-  private static final Comparator<Sketch> SKETCH_COMPARATOR = new Comparator<Sketch>()
+  private static final Comparator<Sketch> SKETCH_COMPARATOR = new Comparator<>()
   {
     @Override
     public int compare(Sketch o1, Sketch o2)
@@ -90,7 +90,7 @@ public int compare(Sketch o1, Sketch o2)
     }
   };
 
-  private static final Comparator<Memory> MEMORY_COMPARATOR = new Comparator<Memory>()
+  private static final Comparator<Memory> MEMORY_COMPARATOR = new Comparator<>()
   {
     @SuppressWarnings("SubtractionInCompareTo")
     @Override
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java
index 11ad6b218e1e..d0cde7c85f5c 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java
@@ -50,7 +50,7 @@ public class ArrayOfDoublesSketchBuildAggregator implements Aggregator
   private final int nominalEntries;
   private final boolean canLookupUtf8;
   private final boolean canCacheById;
-  private final LinkedHashMap<Integer, Object> stringCache = new LinkedHashMap<Integer, Object>()
+  private final LinkedHashMap<Integer, Object> stringCache = new LinkedHashMap<>()
   {
     @Override
     protected boolean removeEldestEntry(Map.Entry eldest)
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java
index b925220c89fd..8acaef908191 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java
@@ -53,7 +53,7 @@ public class ArrayOfDoublesSketchBuildBufferAggregator implements BufferAggregat
 
   private final boolean canLookupUtf8;
   private final boolean canCacheById;
-  private final LinkedHashMap<Integer, Object> stringCache = new LinkedHashMap<Integer, Object>()
+  private final LinkedHashMap<Integer, Object> stringCache = new LinkedHashMap<>()
   {
     @Override
     protected boolean removeEldestEntry(Map.Entry eldest)
diff --git a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java
index d62c6c61ce7a..1009391c9574 100644
--- a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java
+++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java
@@ -56,7 +56,9 @@ public void makeAggregateCombiner()
     sketch2.update("b", new double[] {1});
     sketch2.update("c", new double[] {1});
 
-    TestObjectColumnSelector<ArrayOfDoublesSketch> selector = new TestObjectColumnSelector<ArrayOfDoublesSketch>(new ArrayOfDoublesSketch[] {sketch1, sketch2});
+    TestObjectColumnSelector<ArrayOfDoublesSketch> selector = new TestObjectColumnSelector<>(
+        new ArrayOfDoublesSketch[]{sketch1, sketch2}
+    );
 
     combiner.reset(selector);
     Assert.assertEquals(1, combiner.getObject().getEstimate(), 0);
diff --git a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
index 5169ae56d8e6..44948df4a6ad 100644
--- a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
+++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
@@ -63,34 +63,22 @@ public class BasicAuthUtils
       (throwable) -> throwable instanceof BasicSecurityDBResourceException;
 
   public static final TypeReference<Map<String, BasicAuthenticatorUser>> AUTHENTICATOR_USER_MAP_TYPE_REFERENCE =
-      new TypeReference<Map<String, BasicAuthenticatorUser>>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final TypeReference<Map<String, BasicAuthorizerUser>> AUTHORIZER_USER_MAP_TYPE_REFERENCE =
-      new TypeReference<Map<String, BasicAuthorizerUser>>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final TypeReference<Map<String, BasicAuthorizerGroupMapping>> AUTHORIZER_GROUP_MAPPING_MAP_TYPE_REFERENCE =
-      new TypeReference<Map<String, BasicAuthorizerGroupMapping>>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final TypeReference<Map<String, BasicAuthorizerRole>> AUTHORIZER_ROLE_MAP_TYPE_REFERENCE =
-      new TypeReference<Map<String, BasicAuthorizerRole>>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final TypeReference<UserAndRoleMap> AUTHORIZER_USER_AND_ROLE_MAP_TYPE_REFERENCE =
-      new TypeReference<UserAndRoleMap>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final TypeReference<GroupMappingAndRoleMap> AUTHORIZER_GROUP_MAPPING_AND_ROLE_MAP_TYPE_REFERENCE =
-      new TypeReference<GroupMappingAndRoleMap>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static byte[] generateSalt()
   {
diff --git a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
index c0761c03ec21..bbebdf9e7282 100644
--- a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
+++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
@@ -168,7 +168,7 @@ public void start()
           exec,
           new Duration(commonCacheConfig.getPollingPeriod()),
           new Duration(commonCacheConfig.getPollingPeriod()),
-          new Callable<ScheduledExecutors.Signal>()
+          new Callable<>()
           {
             @Override
             public ScheduledExecutors.Signal call()
diff --git a/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/validator/LDAPCredentialsValidatorTest.java b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/validator/LDAPCredentialsValidatorTest.java
index 7a1ae2cc917b..19e35b0f8e6e 100644
--- a/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/validator/LDAPCredentialsValidatorTest.java
+++ b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/validator/LDAPCredentialsValidatorTest.java
@@ -114,7 +114,7 @@ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingExcep
               ArgumentMatchers.eq(LDAP_CONFIG.getBaseDn()),
               ArgumentMatchers.eq(StringUtils.format(LDAP_CONFIG.getUserSearch(), encodedUsername)),
               ArgumentMatchers.any(SearchControls.class))
-      ).thenReturn(new NamingEnumeration<SearchResult>()
+      ).thenReturn(new NamingEnumeration<>()
       {
         @Override
         public SearchResult next()
diff --git a/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorTest.java b/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorTest.java
index 5888b7d13dde..d914e71ccac5 100644
--- a/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorTest.java
+++ b/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorTest.java
@@ -158,7 +158,7 @@ private static void createStringFilter(List<String[]> values, BloomKFilter filte
   private static List<String[]> dimensionValues(Object... values)
   {
     return Lists.transform(
-        Lists.newArrayList(values), new Function<Object, String[]>()
+        Lists.newArrayList(values), new Function<>()
         {
           @Nullable
           @Override
diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/sql/SQLCatalogManager.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/sql/SQLCatalogManager.java
index fa24bd825613..a2300fc7c404 100644
--- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/sql/SQLCatalogManager.java
+++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/sql/SQLCatalogManager.java
@@ -142,7 +142,7 @@ public long create(TableMetadata table) throws DuplicateKeyException
   {
     try {
       return dbi.withHandle(
-          new HandleCallback<Long>()
+          new HandleCallback<>()
           {
             @Override
             public Long withHandle(Handle handle) throws DuplicateKeyException
@@ -197,7 +197,7 @@ public TableMetadata read(TableId id) throws NotFoundException
   {
     try {
       return dbi.withHandle(
-          new HandleCallback<TableMetadata>()
+          new HandleCallback<>()
           {
             @Override
             public TableMetadata withHandle(Handle handle) throws NotFoundException
@@ -248,7 +248,7 @@ public long replace(TableMetadata table) throws NotFoundException
   {
     try {
       final TableMetadata revised = dbi.withHandle(
-          new HandleCallback<TableMetadata>()
+          new HandleCallback<>()
           {
             @Override
             public TableMetadata withHandle(Handle handle) throws NotFoundException
@@ -293,7 +293,7 @@ public long update(TableMetadata table, long oldVersion) throws NotFoundExceptio
   {
     try {
       final TableMetadata revised = dbi.withHandle(
-          new HandleCallback<TableMetadata>()
+          new HandleCallback<>()
           {
             @Override
             public TableMetadata withHandle(Handle handle) throws NotFoundException
@@ -354,7 +354,7 @@ public long updateProperties(
   {
     try {
       final TableMetadata result = dbi.withHandle(
-          new HandleCallback<TableMetadata>()
+          new HandleCallback<>()
           {
             @Override
             public TableMetadata withHandle(Handle handle) throws CatalogException
@@ -446,7 +446,7 @@ public long updateColumns(
   {
     try {
       final TableMetadata result = dbi.withHandle(
-          new HandleCallback<TableMetadata>()
+          new HandleCallback<>()
           {
             @Override
             public TableMetadata withHandle(Handle handle) throws CatalogException
@@ -527,7 +527,7 @@ public TableMetadata withHandle(Handle handle) throws CatalogException
   public long markDeleting(TableId id)
   {
     return dbi.withHandle(
-        new HandleCallback<Long>()
+        new HandleCallback<>()
         {
           @Override
           public Long withHandle(Handle handle)
@@ -593,7 +593,7 @@ public Void withHandle(Handle handle) throws NotFoundException
   public List<TableId> allTablePaths()
   {
     return dbi.withHandle(
-        new HandleCallback<List<TableId>>()
+        new HandleCallback<>()
         {
           @Override
           public List<TableId> withHandle(Handle handle)
@@ -621,7 +621,7 @@ public List<TableId> withHandle(Handle handle)
   public List<String> tableNamesInSchema(String dbSchema)
   {
     return dbi.withHandle(
-        new HandleCallback<List<String>>()
+        new HandleCallback<>()
         {
           @Override
           public List<String> withHandle(Handle handle)
@@ -650,7 +650,7 @@ public List<String> withHandle(Handle handle)
   public List<TableMetadata> tablesInSchema(String dbSchema)
   {
     return dbi.withHandle(
-        new HandleCallback<List<TableMetadata>>()
+        new HandleCallback<>()
         {
           @Override
           public List<TableMetadata> withHandle(Handle handle)
@@ -762,8 +762,7 @@ private static TableSpec tableSpecFromBytes(
     );
   }
 
-  private static final TypeReference<Map<String, Object>> PROPERTIES_TYPE_REF =
-      new TypeReference<Map<String, Object>>() { };
+  private static final TypeReference<Map<String, Object>> PROPERTIES_TYPE_REF = new TypeReference<>() {};
 
   private static Map<String, Object> propertiesFromBytes(
       final ObjectMapper jsonMapper,
@@ -773,8 +772,7 @@ private static Map<String, Object> propertiesFromBytes(
     return fromBytes(jsonMapper, properties, PROPERTIES_TYPE_REF);
   }
 
-  private static final TypeReference<List<ColumnSpec>> COLUMNS_TYPE_REF =
-      new TypeReference<List<ColumnSpec>>() { };
+  private static final TypeReference<List<ColumnSpec>> COLUMNS_TYPE_REF = new TypeReference<>() {};
 
   private static List<ColumnSpec> columnsFromBytes(
       final ObjectMapper jsonMapper,
diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java
index 5426f001a34b..21c198480908 100644
--- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java
+++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java
@@ -59,13 +59,9 @@ public class CatalogClient implements CatalogSource
 {
   public static final String SCHEMA_SYNC_PATH = CatalogResource.ROOT_PATH + CatalogResource.SCHEMA_SYNC;
   public static final String TABLE_SYNC_PATH = CatalogResource.ROOT_PATH + CatalogResource.TABLE_SYNC;
-  private static final TypeReference<List<TableMetadata>> LIST_OF_TABLE_METADATA_TYPE = new TypeReference<List<TableMetadata>>()
-  {
-  };
+  private static final TypeReference<List<TableMetadata>> LIST_OF_TABLE_METADATA_TYPE = new TypeReference<>() {};
   // Not strictly needed as a TypeReference, but doing so makes the code simpler.
-  private static final TypeReference<TableMetadata> TABLE_METADATA_TYPE = new TypeReference<TableMetadata>()
-  {
-  };
+  private static final TypeReference<TableMetadata> TABLE_METADATA_TYPE = new TypeReference<>() {};
 
   private final DruidLeaderClient coordClient;
   private final ObjectMapper smileMapper;
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosAuthenticationHandler.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosAuthenticationHandler.java
index add376761a92..16eb3b28e6b9 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosAuthenticationHandler.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosAuthenticationHandler.java
@@ -53,7 +53,7 @@ public class DruidKerberosAuthenticationHandler extends KerberosAuthenticationHa
   private String keytab;
   private GSSManager gssManager;
   private Subject serverSubject = new Subject();
-  private List<LoginContext> loginContexts = new ArrayList<LoginContext>();
+  private List<LoginContext> loginContexts = new ArrayList<>();
 
   @Override
   public void destroy()
@@ -120,7 +120,7 @@ public void init(Properties config) throws ServletException
         loginContexts.add(loginContext);
       }
       try {
-        gssManager = Subject.doAs(serverSubject, new PrivilegedExceptionAction<GSSManager>()
+        gssManager = Subject.doAs(serverSubject, new PrivilegedExceptionAction<>()
         {
 
           @Override
@@ -157,7 +157,7 @@ public AuthenticationToken authenticate(HttpServletRequest request, final HttpSe
       final byte[] clientToken = StringUtils.decodeBase64String(authorization);
       final String serverName = request.getServerName();
       try {
-        token = Subject.doAs(serverSubject, new PrivilegedExceptionAction<AuthenticationToken>()
+        token = Subject.doAs(serverSubject, new PrivilegedExceptionAction<>()
         {
 
           @Override
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java
index a58c7997aa48..3e0e04e215e7 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java
@@ -376,7 +376,7 @@ public Class<? extends Filter> getFilterClass()
   @Override
   public Map<String, String> getInitParameters()
   {
-    Map<String, String> params = new HashMap<String, String>();
+    Map<String, String> params = new HashMap<>();
     params.put("kerberos.principal", serverPrincipal);
     params.put("kerberos.keytab", serverKeytab);
     params.put(AuthenticationFilter.AUTH_TYPE, DruidKerberosAuthenticationHandler.class.getName());
@@ -447,7 +447,7 @@ public DruidKerberosConfiguration(String keytab, String principal)
     @Override
     public AppConfigurationEntry[] getAppConfigurationEntry(String name)
     {
-      Map<String, String> options = new HashMap<String, String>();
+      Map<String, String> options = new HashMap<>();
       if (System.getProperty("java.vendor").contains("IBM")) {
         options.put(
             "useKeytab",
@@ -508,9 +508,9 @@ private void initializeKerberosLogin() throws ServletException
         throw new ServletException("Keytab does not exist: " + keytab);
       }
 
-      Set<Principal> principals = new HashSet<Principal>();
+      Set<Principal> principals = new HashSet<>();
       principals.add(new KerberosPrincipal(serverPrincipal));
-      Subject subject = new Subject(false, principals, new HashSet<Object>(), new HashSet<Object>());
+      Subject subject = new Subject(false, principals, new HashSet<>(), new HashSet<>());
 
       DruidKerberosConfiguration kerberosConfiguration = new DruidKerberosConfiguration(keytab, serverPrincipal);
 
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java
index eee32ac44e24..da1cc598cabd 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java
@@ -99,7 +99,7 @@ private <Intermediate, Final> void inner_go(
         );
         DruidKerberosUtil.authenticateIfRequired(internalClientPrincipal, internalClientKeytab);
         UserGroupInformation currentUser = UserGroupInformation.getCurrentUser();
-        String challenge = currentUser.doAs(new PrivilegedExceptionAction<String>()
+        String challenge = currentUser.doAs(new PrivilegedExceptionAction<>()
         {
           @Override
           public String run() throws Exception
@@ -122,7 +122,7 @@ public String run() throws Exception
           duration
       );
 
-      Futures.addCallback(internalFuture, new FutureCallback<RetryResponseHolder<Final>>()
+      Futures.addCallback(internalFuture, new FutureCallback<>()
       {
         @Override
         public void onSuccess(RetryResponseHolder<Final> result)
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/ResponseCookieHandler.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/ResponseCookieHandler.java
index 50973447b57d..ece3bc69906a 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/ResponseCookieHandler.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/ResponseCookieHandler.java
@@ -53,7 +53,7 @@ public ClientResponse<Intermediate> handleResponse(HttpResponse httpResponse, Tr
   {
     try {
       final HttpHeaders headers = httpResponse.headers();
-      manager.put(uri, Maps.asMap(headers.names(), new Function<String, List<String>>()
+      manager.put(uri, Maps.asMap(headers.names(), new Function<>()
       {
         @Override
         public List<String> apply(String input)
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryResponseHolder.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryResponseHolder.java
index acfb747914ee..c8721f1d3400 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryResponseHolder.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryResponseHolder.java
@@ -32,7 +32,7 @@ public RetryResponseHolder(boolean shouldRetry, T obj)
 
   public static <T> RetryResponseHolder<T> retry()
   {
-    return new RetryResponseHolder<T>(true, null);
+    return new RetryResponseHolder<>(true, null);
   }
 
   public boolean shouldRetry()
diff --git a/extensions-core/ec2-extensions/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java b/extensions-core/ec2-extensions/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java
index 56ffc6b74efc..7d996297b12e 100644
--- a/extensions-core/ec2-extensions/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java
+++ b/extensions-core/ec2-extensions/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java
@@ -152,7 +152,7 @@ public AutoScalingData provision()
 
       final List<String> instanceIds = Lists.transform(
           result.getReservation().getInstances(),
-          new Function<Instance, String>()
+          new Function<>()
           {
             @Override
             public String apply(Instance input)
@@ -167,7 +167,7 @@ public String apply(Instance input)
       return new AutoScalingData(
           Lists.transform(
               result.getReservation().getInstances(),
-              new Function<Instance, String>()
+              new Function<>()
               {
                 @Override
                 public String apply(Instance input)
@@ -208,7 +208,7 @@ public AutoScalingData terminate(List<String> ips)
       return terminateWithIds(
           Lists.transform(
               instances,
-              new Function<Instance, String>()
+              new Function<>()
               {
                 @Override
                 public String apply(Instance input)
diff --git a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPuller.java b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPuller.java
index 61595264fc67..8e155f6a4ce8 100644
--- a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPuller.java
+++ b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPuller.java
@@ -96,7 +96,7 @@ public String getVersion(URI uri) throws IOException
   @Override
   public Predicate<Throwable> shouldRetryPredicate()
   {
-    return new Predicate<Throwable>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(Throwable e)
diff --git a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/output/GoogleStorageConnector.java b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/output/GoogleStorageConnector.java
index 0d147cce25a3..69b3e28c8060 100644
--- a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/output/GoogleStorageConnector.java
+++ b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/output/GoogleStorageConnector.java
@@ -199,7 +199,7 @@ public ChunkingStorageConnectorParameters<GoogleInputRange> buildInputParams(Str
         config.getBucket(),
         objectPath(path)
     )));
-    builder.objectOpenFunction(new ObjectOpenFunction<GoogleInputRange>()
+    builder.objectOpenFunction(new ObjectOpenFunction<>()
     {
       @Override
       public InputStream open(GoogleInputRange googleInputRange) throws IOException
diff --git a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java
index 1c0adbd133c3..5dc6d810cbcc 100644
--- a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java
+++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java
@@ -56,7 +56,7 @@ public class HdfsDataSegmentPuller implements URIDataPuller
 {
   public static final int DEFAULT_RETRY_COUNT = 3;
 
-  public static final Predicate<Throwable> RETRY_PREDICATE = new Predicate<Throwable>()
+  public static final Predicate<Throwable> RETRY_PREDICATE = new Predicate<>()
   {
     @Override
     public boolean apply(Throwable input)
diff --git a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
index b26c2858f4b9..7bdf8c06980f 100644
--- a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
+++ b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
@@ -397,7 +397,7 @@ public static class TestModule extends SimpleModule
         addSerializer(NumberedShardSpec.class, ToStringSerializer.instance);
         addDeserializer(
             Interval.class,
-            new StdDeserializer<Interval>(Interval.class)
+            new StdDeserializer<>(Interval.class)
             {
               @Override
               public Interval deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
diff --git a/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java
index 12f1afa296de..11236b8d25fe 100644
--- a/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java
+++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java
@@ -1659,7 +1659,7 @@ public Histogram toHistogram(final float bucketSize, final float offset)
 
     final float cutoff = 0.1f;
 
-    final ArrayList<Float> breaks = new ArrayList<Float>();
+    final ArrayList<Float> breaks = new ArrayList<>();
 
     // to deal with left inclusivity when the min is the same as a break
     final float bottomBreak = minFloor - bucketSize;
diff --git a/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java
index dd35874b8e27..31784f0d744a 100644
--- a/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java
+++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java
@@ -82,7 +82,7 @@ public ApproximateHistogram extractValue(InputRow inputRow, String metricName)
   @Override
   public ObjectStrategy<ApproximateHistogram> getObjectStrategy()
   {
-    return new ObjectStrategy<ApproximateHistogram>()
+    return new ObjectStrategy<>()
     {
       @Override
       public Class<ApproximateHistogram> getClazz()
diff --git a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java
index bcdc7d46e98c..232979f677ea 100644
--- a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java
+++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java
@@ -60,7 +60,7 @@ public void testApproxHistogramCompute()
       selector.increment();
     }
 
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put("price", agg.get());
 
     ApproximateHistogramPostAggregator approximateHistogramPostAggregator = new EqualBucketsPostAggregator(
diff --git a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java
index ae6c634ad0bc..531b530328b7 100644
--- a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java
+++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java
@@ -114,7 +114,7 @@ public void testTopNWithApproximateHistogramAgg()
         .build();
 
     List<Result<TopNResultValue>> expectedResults = Collections.singletonList(
-        new Result<TopNResultValue>(
+        new Result<>(
             DateTimes.of("2011-01-12T00:00:00.000Z"),
             TopNResultValue.create(
                 Arrays.<Map<String, Object>>asList(
diff --git a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/FixedBucketsHistogramTopNQueryTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/FixedBucketsHistogramTopNQueryTest.java
index cead791167d3..474cd9759dac 100644
--- a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/FixedBucketsHistogramTopNQueryTest.java
+++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/FixedBucketsHistogramTopNQueryTest.java
@@ -113,7 +113,7 @@ public void testTopNWithFixedHistogramAgg()
         .build();
 
     List<Result<TopNResultValue>> expectedResults = Collections.singletonList(
-        new Result<TopNResultValue>(
+        new Result<>(
             DateTimes.of("2011-01-12T00:00:00.000Z"),
             TopNResultValue.create(
                 Arrays.<Map<String, Object>>asList(
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/data/input/kafkainput/KafkaInputReader.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/data/input/kafkainput/KafkaInputReader.java
index 1ce992d7cc37..b0964dfe5467 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/data/input/kafkainput/KafkaInputReader.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/data/input/kafkainput/KafkaInputReader.java
@@ -289,7 +289,7 @@ private static Map<String, Object> buildBlendedEventMap(
     final Set<String> keySet = new HashSet<>(fallback.keySet());
     keySet.addAll(rowDimensions);
 
-    return new AbstractMap<String, Object>()
+    return new AbstractMap<>()
     {
       @Override
       public Object get(Object key)
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java
index 5756d6a3fae5..b16f825308fc 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java
@@ -218,9 +218,7 @@ protected boolean isEndOfShard(Long seqNum)
   @Override
   public TypeReference<List<SequenceMetadata<KafkaTopicPartition, Long>>> getSequenceMetadataTypeReference()
   {
-    return new TypeReference<List<SequenceMetadata<KafkaTopicPartition, Long>>>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Nullable
@@ -234,9 +232,7 @@ protected TreeMap<Integer, Map<KafkaTopicPartition, Long>> getCheckPointsFromCon
       log.debug("Got checkpoints from task context[%s].", checkpointsString);
       return toolbox.getJsonMapper().readValue(
           checkpointsString,
-          new TypeReference<TreeMap<Integer, Map<KafkaTopicPartition, Long>>>()
-          {
-          }
+          new TypeReference<>() {}
       );
     } else {
       return null;
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java
index 2618c22495ea..f449c158789a 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java
@@ -85,9 +85,7 @@
 public class KafkaSupervisor extends SeekableStreamSupervisor<KafkaTopicPartition, Long, KafkaRecordEntity>
 {
   public static final TypeReference<TreeMap<Integer, Map<KafkaTopicPartition, Long>>> CHECKPOINTS_TYPE_REF =
-      new TypeReference<TreeMap<Integer, Map<KafkaTopicPartition, Long>>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private static final EmittingLogger log = new EmittingLogger(KafkaSupervisor.class);
   private static final Long NOT_SET = -1L;
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/data/input/kafkainput/KafkaStringHeaderFormatTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/data/input/kafkainput/KafkaStringHeaderFormatTest.java
index ab634b3d6715..913c1aca1ad9 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/data/input/kafkainput/KafkaStringHeaderFormatTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/data/input/kafkainput/KafkaStringHeaderFormatTest.java
@@ -100,7 +100,7 @@ public void testDefaultHeaderFormat()
   {
     String headerLabelPrefix = "test.kafka.header.";
     Headers headers = new RecordHeaders(SAMPLE_HEADERS);
-    inputEntity = new KafkaRecordEntity(new ConsumerRecord<byte[], byte[]>(
+    inputEntity = new KafkaRecordEntity(new ConsumerRecord<>(
         "sample", 0, 0, timestamp,
         null, null, 0, 0,
         null, "sampleValue".getBytes(StandardCharsets.UTF_8), headers
@@ -151,7 +151,7 @@ public byte[] value()
 
     String headerLabelPrefix = "test.kafka.header.";
     Headers headers = new RecordHeaders(header);
-    inputEntity = new KafkaRecordEntity(new ConsumerRecord<byte[], byte[]>(
+    inputEntity = new KafkaRecordEntity(new ConsumerRecord<>(
         "sample", 0, 0, timestamp,
         null, null, 0, 0,
         null, "sampleValue".getBytes(StandardCharsets.UTF_8), headers
@@ -203,7 +203,7 @@ public byte[] value()
 
     String headerLabelPrefix = "test.kafka.header.";
     Headers headers = new RecordHeaders(header);
-    inputEntity = new KafkaRecordEntity(new ConsumerRecord<byte[], byte[]>(
+    inputEntity = new KafkaRecordEntity(new ConsumerRecord<>(
         "sample", 0, 0, timestamp,
         null, null, 0, 0,
         null, "sampleValue".getBytes(StandardCharsets.UTF_8), headers
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
index 0621f6f9ba15..a0eb4e942aa3 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
@@ -2287,9 +2287,7 @@ public void testRunWithPauseAndResume() throws Exception
 
     Map<KafkaTopicPartition, Long> currentOffsets = OBJECT_MAPPER.readValue(
         task.getRunner().pause().getEntity().toString(),
-        new TypeReference<Map<KafkaTopicPartition, Long>>()
-        {
-        }
+        new TypeReference<>() {}
     );
     Assert.assertEquals(Status.PAUSED, task.getRunner().getStatus());
     Assert.assertEquals(Status.PAUSED.toString(), task.getCurrentRunnerStatus());
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamEndSequenceNumbersTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamEndSequenceNumbersTest.java
index e3b3cef6cb20..d8aa85369359 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamEndSequenceNumbersTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamEndSequenceNumbersTest.java
@@ -61,7 +61,7 @@ public void testSerde() throws Exception
     // Check round-trip.
     final SeekableStreamEndSequenceNumbers<KafkaTopicPartition, Long> partitions2 = OBJECT_MAPPER.readValue(
         serializedString,
-        new TypeReference<SeekableStreamEndSequenceNumbers<KafkaTopicPartition, Long>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamStartSequenceNumbersTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamStartSequenceNumbersTest.java
index 07eaced75559..5ed51f092a84 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamStartSequenceNumbersTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamStartSequenceNumbersTest.java
@@ -66,7 +66,7 @@ public void testSerde() throws Exception
     // Check round-trip.
     final SeekableStreamStartSequenceNumbers<KafkaTopicPartition, Long> partitions2 = OBJECT_MAPPER.readValue(
         serializedString,
-        new TypeReference<SeekableStreamStartSequenceNumbers<KafkaTopicPartition, Long>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
index 8f2f3167ecd9..40a97f1e1ada 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
@@ -2666,7 +2666,7 @@ public void testSupervisorIsIdleIfStreamInactiveWhenNoActiveTasks() throws Excep
     taskRunner.registerListener(EasyMock.anyObject(TaskRunnerListener.class), EasyMock.anyObject(Executor.class));
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KafkaDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<KafkaTopicPartition, Long>(
+            new SeekableStreamEndSequenceNumbers<>(
                 topic,
                 singlePartitionMap(topic,
                                    0,
@@ -2724,7 +2724,7 @@ public void testSupervisorNotIdleIfStreamInactiveWhenSuspended() throws Exceptio
     taskRunner.registerListener(EasyMock.anyObject(TaskRunnerListener.class), EasyMock.anyObject(Executor.class));
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KafkaDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<KafkaTopicPartition, Long>(
+            new SeekableStreamEndSequenceNumbers<>(
                 topic,
                 singlePartitionMap(topic,
                                    0,
@@ -2784,7 +2784,7 @@ public void testSupervisorIsIdleIfStreamInactiveWhenSuspended() throws Exception
     taskRunner.registerListener(EasyMock.anyObject(TaskRunnerListener.class), EasyMock.anyObject(Executor.class));
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KafkaDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<KafkaTopicPartition, Long>(
+            new SeekableStreamEndSequenceNumbers<>(
                 topic,
                 singlePartitionMap(topic,
                                    0,
diff --git a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java
index d0c30280a2b7..b5633c1c3c7e 100644
--- a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java
+++ b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java
@@ -204,7 +204,7 @@ private Map<String, Object> buildBlendedEventMap(
     final Set<String> keySet = new HashSet<>(fallback.keySet());
     keySet.addAll(rowDimensions);
 
-    return new AbstractMap<String, Object>()
+    return new AbstractMap<>()
     {
       @Override
       public Object get(Object key)
diff --git a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskRunner.java b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskRunner.java
index 72e61635912c..dfca894d2819 100644
--- a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskRunner.java
+++ b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskRunner.java
@@ -181,9 +181,7 @@ protected boolean isEndOfShard(String seqNum)
   @Override
   public TypeReference<List<SequenceMetadata<String, String>>> getSequenceMetadataTypeReference()
   {
-    return new TypeReference<List<SequenceMetadata<String, String>>>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Nullable
@@ -197,9 +195,7 @@ protected TreeMap<Integer, Map<String, String>> getCheckPointsFromContext(
       log.debug("Got checkpoints from task context[%s]", checkpointsString);
       return toolbox.getJsonMapper().readValue(
           checkpointsString,
-          new TypeReference<TreeMap<Integer, Map<String, String>>>()
-          {
-          }
+          new TypeReference<>() {}
       );
     } else {
       return null;
diff --git a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java
index 2391b1265bab..db29d0dae53d 100644
--- a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java
+++ b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java
@@ -79,9 +79,7 @@ public class KinesisSupervisor extends SeekableStreamSupervisor<String, String,
   private static final EmittingLogger log = new EmittingLogger(KinesisSupervisor.class);
 
   public static final TypeReference<TreeMap<Integer, Map<String, String>>> CHECKPOINTS_TYPE_REF =
-      new TypeReference<TreeMap<Integer, Map<String, String>>>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final String OFFSET_NOT_SET = "-1";
   private final KinesisSupervisorSpec spec;
diff --git a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
index dc10e348138a..1fc1da973859 100644
--- a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
+++ b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
@@ -4311,7 +4311,7 @@ private List<Task> testShardSplitPhaseTwo(List<Task> phaseOneTasks) throws Excep
     // first task ran, its shard 0 has reached EOS
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KinesisDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<String, String>(
+            new SeekableStreamEndSequenceNumbers<>(
                 STREAM,
                 ImmutableMap.of(SHARD_ID0, KinesisSequenceNumber.END_OF_SHARD_MARKER)
             )
@@ -4468,7 +4468,7 @@ private void testShardSplitPhaseThree(List<Task> phaseTwoTasks) throws Exception
     // second set of tasks ran, shard 0 has expired, but shard 1 and 2 have data
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KinesisDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<String, String>(
+            new SeekableStreamEndSequenceNumbers<>(
                 STREAM,
                 ImmutableMap.of(
                     SHARD_ID0, KinesisSequenceNumber.END_OF_SHARD_MARKER,
@@ -4483,7 +4483,7 @@ private void testShardSplitPhaseThree(List<Task> phaseTwoTasks) throws Exception
         indexerMetadataStorageCoordinator.resetDataSourceMetadata(
             DATASOURCE,
             new KinesisDataSourceMetadata(
-                new SeekableStreamEndSequenceNumbers<String, String>(
+                new SeekableStreamEndSequenceNumbers<>(
                     STREAM,
                     ImmutableMap.of(
                         SHARD_ID0, KinesisSequenceNumber.EXPIRED_MARKER,
@@ -4768,7 +4768,7 @@ private List<Task> testShardMergePhaseTwo(List<Task> phaseOneTasks) throws Excep
     // first tasks ran, both shard 0 and shard 1 have reached EOS, merged into shard 2
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KinesisDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<String, String>(
+            new SeekableStreamEndSequenceNumbers<>(
                 STREAM,
                 ImmutableMap.of(
                     SHARD_ID0, KinesisSequenceNumber.END_OF_SHARD_MARKER,
@@ -4909,7 +4909,7 @@ private void testShardMergePhaseThree(List<Task> phaseTwoTasks) throws Exception
     // second set of tasks ran, shard 0 has expired, but shard 1 and 2 have data
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KinesisDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<String, String>(
+            new SeekableStreamEndSequenceNumbers<>(
                 STREAM,
                 ImmutableMap.of(
                     SHARD_ID0, KinesisSequenceNumber.END_OF_SHARD_MARKER,
@@ -4924,7 +4924,7 @@ private void testShardMergePhaseThree(List<Task> phaseTwoTasks) throws Exception
         indexerMetadataStorageCoordinator.resetDataSourceMetadata(
             DATASOURCE,
             new KinesisDataSourceMetadata(
-                new SeekableStreamEndSequenceNumbers<String, String>(
+                new SeekableStreamEndSequenceNumbers<>(
                     STREAM,
                     ImmutableMap.of(
                         SHARD_ID0, KinesisSequenceNumber.EXPIRED_MARKER,
diff --git a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
index 00ad6b76abb2..03a1b6914a85 100644
--- a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
+++ b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
@@ -145,7 +145,7 @@ public boolean hasNext() throws SocketTimeoutException
                   LOGGER.debug("item of type " + item.type + " was NULL when watching nodeRole [%s]", nodeRole);
                 }
 
-                obj = new Watch.Response<DiscoveryDruidNodeAndResourceVersion>(
+                obj = new Watch.Response<>(
                     item.type,
                     result
                 );
diff --git a/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncerTest.java b/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncerTest.java
index ffcaefb56177..fc0304009f73 100644
--- a/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncerTest.java
+++ b/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncerTest.java
@@ -67,9 +67,7 @@ public void testAnnounce() throws Exception
 
     List<Map<String, Object>> actualPatchList = jsonMapper.readValue(
         patchArg.getValue(),
-        new TypeReference<List<Map<String, Object>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     List<Map<String, Object>> expectedPatchList = Lists.newArrayList(
@@ -115,9 +113,7 @@ public void testUnannounce() throws Exception
 
     List<Map<String, String>> actualPatchList = jsonMapper.readValue(
         patchArg.getValue(),
-        new TypeReference<List<Map<String, String>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     List<Map<String, String>> expectedPatchList = Lists.newArrayList(
diff --git a/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeDiscoveryProviderTest.java b/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeDiscoveryProviderTest.java
index 4a9c5d041642..12a3a6118da8 100644
--- a/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeDiscoveryProviderTest.java
+++ b/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeDiscoveryProviderTest.java
@@ -240,7 +240,7 @@ public void testNodeRoleWatcherLoopOnNullItems() throws Exception
             )
         )
     );
-    List<Watch.Response<DiscoveryDruidNodeAndResourceVersion>> nullList = new ArrayList<Watch.Response<DiscoveryDruidNodeAndResourceVersion>>();
+    List<Watch.Response<DiscoveryDruidNodeAndResourceVersion>> nullList = new ArrayList<>();
     nullList.add(null);
     EasyMock.expect(mockK8sApiClient.watchPods(
         podInfo.getPodNamespace(), labelSelector, "v1", NodeRole.ROUTER)).andReturn(
diff --git a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/data/input/MapPopulator.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/data/input/MapPopulator.java
index c5e8c6e4bfc8..a0b591f21227 100644
--- a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/data/input/MapPopulator.java
+++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/data/input/MapPopulator.java
@@ -124,7 +124,7 @@ public PopulateResult populateAndWarnAtByteLimit(
   ) throws IOException
   {
     return source.asCharSource(StandardCharsets.UTF_8).readLines(
-        new LineProcessor<PopulateResult>()
+        new LineProcessor<>()
         {
           private int lines = 0;
           private int entries = 0;
diff --git a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java
index e1c103c0ca23..75981f0b63cc 100644
--- a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java
+++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java
@@ -644,7 +644,7 @@ public ObjectMapperFlatDataParser(
       final JsonFactory jsonFactory = jsonMapper.getFactory().copy();
       jsonFactory.configure(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES, false);
 
-      parser = new Parser<String, String>()
+      parser = new Parser<>()
       {
         @Override
         public Map<String, String> parseToMap(String input)
diff --git a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionModule.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionModule.java
index 3aa087a4a1bb..2b25a877a43b 100644
--- a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionModule.java
+++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionModule.java
@@ -66,12 +66,8 @@ public static MapBinder<Class<? extends ExtractionNamespace>, CacheGenerator<?>>
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends ExtractionNamespace>>()
-        {
-        },
-        new TypeLiteral<CacheGenerator<?>>()
-        {
-        }
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
   }
 
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/LookupUtilsTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/LookupUtilsTest.java
index 7ef6ca501e50..503c97145c5e 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/LookupUtilsTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/LookupUtilsTest.java
@@ -42,14 +42,10 @@
 public class LookupUtilsTest
 {
   private static final TypeReference<Map<String, Object>> LOOKUPS_ALL_GENERIC_REFERENCE =
-      new TypeReference<Map<String, Object>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private static final TypeReference<Map<String, LookupExtractorFactoryContainer>> LOOKUPS_ALL_REFERENCE =
-      new TypeReference<Map<String, LookupExtractorFactoryContainer>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private static final String LOOKUP_VALID_INNER = "  \"lookup_uri_good\": {\n"
                                                    + "    \"version\": \"2021-12-03T01:04:05.151Z\",\n"
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java
index e44641924dc2..bb0c91e49533 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java
@@ -70,7 +70,7 @@ public void setUp() throws Exception
     sink.writeLines(
         Iterables.transform(
             MAPPINGS,
-            new Function<Map<String, Object>, CharSequence>()
+            new Function<>()
             {
               @Override
               public CharSequence apply(Map<String, Object> input)
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java
index 58ef2dc15de3..3caad9cec343 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java
@@ -182,7 +182,7 @@ public void close() throws IOException
             new NamespaceExtractionConfig()
         )
     );
-    return () -> new Iterator<Object[]>()
+    return () -> new Iterator<>()
     {
       Iterator<Object[]> compressionIt = compressionParams.iterator();
       Iterator<Function<Lifecycle, NamespaceExtractionCacheManager>> cacheManagerCreatorsIt =
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java
index fb4d6070e3e8..b6deed7be5ec 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java
@@ -74,7 +74,7 @@
 public class CacheSchedulerTest
 {
   public static final Function<Lifecycle, NamespaceExtractionCacheManager> CREATE_ON_HEAP_CACHE_MANAGER =
-      new Function<Lifecycle, NamespaceExtractionCacheManager>()
+      new Function<>()
       {
         @Nullable
         @Override
@@ -88,7 +88,7 @@ public NamespaceExtractionCacheManager apply(@Nullable Lifecycle lifecycle)
         }
       };
   public static final Function<Lifecycle, NamespaceExtractionCacheManager> CREATE_OFF_HEAP_CACHE_MANAGER =
-      new Function<Lifecycle, NamespaceExtractionCacheManager>()
+      new Function<>()
       {
         @Nullable
         @Override
diff --git a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCache.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCache.java
index 2d26ed7fdf82..2688dcaa0ef7 100644
--- a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCache.java
+++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCache.java
@@ -91,7 +91,7 @@ public OffHeapLoadingCache(
                    .expireAfterAccess(this.expireAfterAccess, TimeUnit.MILLISECONDS)
                    .expireMaxSize(this.maxEntriesSize)
                    .make();
-    cache.modificationListenerAdd(new Bind.MapListener<K, V>()
+    cache.modificationListenerAdd(new Bind.MapListener<>()
     {
       @Override
       public void update(K key, V oldVal, V newVal)
diff --git a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OffHeapPollingCache.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OffHeapPollingCache.java
index b042e1ea1df9..a7cabf8d64fc 100644
--- a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OffHeapPollingCache.java
+++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OffHeapPollingCache.java
@@ -63,12 +63,12 @@ public OffHeapPollingCache(final Iterable<Map.Entry<K, V>> entries)
       final Set<V> setOfValues = setOfValuesBuilder.build();
       reverseCache.putAll(Maps.asMap(
           setOfValues,
-          new Function<V, List<K>>()
+          new Function<>()
           {
             @Override
             public List<K> apply(final V input)
             {
-              return Lists.newArrayList(Maps.filterKeys(mapCache, new Predicate<K>()
+              return Lists.newArrayList(Maps.filterKeys(mapCache, new Predicate<>()
               {
                 @Override
                 public boolean apply(K key)
diff --git a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/QueryKeys.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/QueryKeys.java
index ca90fa668569..308191002044 100644
--- a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/QueryKeys.java
+++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/QueryKeys.java
@@ -55,7 +55,7 @@ public boolean accepts(Class<?> type)
     @Override
     public ContainerBuilder<ImmutableSet<?>> newContainerBuilderFor(Class<?> type)
     {
-      return new ContainerBuilder<ImmutableSet<?>>()
+      return new ContainerBuilder<>()
       {
         final ImmutableSet.Builder<Object> builder = new ImmutableSet.Builder<>();
 
diff --git a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java
index cf67e6e32eaf..4f98411e86d4 100644
--- a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java
+++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java
@@ -109,14 +109,14 @@ public void testSerDeser() throws IOException
     ObjectMapper mapper = TestHelper.makeJsonMapper();
     LoadingLookupFactory loadingLookupFactory = new LoadingLookupFactory(
         new MockDataFetcher(),
-        new OnHeapLoadingCache<String, String>(
+        new OnHeapLoadingCache<>(
             0,
             100,
             100L,
             0L,
             0L
         ),
-        new OffHeapLoadingCache<String, List<String>>(
+        new OffHeapLoadingCache<>(
             100,
             100L,
             0L,
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java
index 66686f7640f9..c35ca39a9f04 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java
@@ -237,7 +237,7 @@ private Sequence<Object[]> runWithReport(final ControllerHolder controllerHolder
 
     // Return a sequence that reads one row (the report) from reportFuture.
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<Object[], Iterator<Object[]>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<Object[]> make()
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java
index 3373bbd883ee..daad4021368c 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java
@@ -147,7 +147,7 @@ private static <T> ListenableFuture<T> wrap(
 
     Futures.addCallback(
         clientFuture,
-        new FutureCallback<T>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(@Nullable T result)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java
index 7f81a9c4a9c1..95f0335b71f5 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java
@@ -74,7 +74,7 @@ public ResourceHolder<ProcessingBuffers> acquireForStage(final StageDefinition s
       throw DruidException.defensive("Processing buffers not available");
     }
 
-    return new ResourceHolder<ProcessingBuffers>()
+    return new ResourceHolder<>()
     {
       @Override
       public ProcessingBuffers get()
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java
index 8b6216861a13..024036cdbff5 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java
@@ -541,7 +541,7 @@ private void setUpCompletionCallbacks()
                 stageOutputChannelsFuture
             )
         ),
-        new FutureCallback<List<Object>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(final List<Object> workerResultAndOutputChannelsResolved)
@@ -1086,7 +1086,7 @@ private ResultAndChannels<?> gatherResultKeyStatistics(final OutputChannels chan
 
       Futures.addCallback(
           clusterByStatisticsCollectorFuture,
-          new FutureCallback<ClusterByStatisticsCollector>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(final ClusterByStatisticsCollector result)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java
index 6c9f1d899413..44654810ac61 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java
@@ -867,7 +867,7 @@ private ListeningExecutorService makeProcessingPool()
           @Override
           public <T> Callable<T> decorateCallable(Callable<T> callable)
           {
-            return new PrioritizedCallable<T>()
+            return new PrioritizedCallable<>()
             {
               @Override
               public int getPriority()
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java
index b0da5b83a46b..256e76307c81 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java
@@ -156,7 +156,7 @@ private void fetchStatsFromWorker(
 
     SettableFuture<Boolean> kernelActionFuture = SettableFuture.create();
 
-    Futures.addCallback(fetchFuture, new FutureCallback<ClusterByStatisticsSnapshot>()
+    Futures.addCallback(fetchFuture, new FutureCallback<>()
     {
       @Override
       public void onSuccess(@Nullable ClusterByStatisticsSnapshot result)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
index 1796df89bf71..3fa5654c2a55 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
@@ -151,7 +151,7 @@ public ProcessorsAndChannels<DataSegment, Set<DataSegment>> makeProcessors(
     final Sequence<Pair<Integer, ReadableInput>> inputSequence =
         Sequences.simple(Iterables.transform(
             inputSliceReader.attach(0, slice, counters, warningPublisher),
-            new Function<ReadableInput, Pair<Integer, ReadableInput>>()
+            new Function<>()
             {
               int i = 0;
 
@@ -237,7 +237,7 @@ public boolean usesProcessingBuffers()
   @Override
   public TypeReference<Set<DataSegment>> getResultTypeReference()
   {
-    return new TypeReference<Set<DataSegment>>() {};
+    return new TypeReference<>() {};
   }
 
   @Nullable
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java
index 4b69a930b1a6..3aae435b8d99 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java
@@ -76,7 +76,7 @@ public CloseableIterator<InputRow> make()
               {
                 try {
                   CloseableIterator<InputRow> baseIterator = reader.read(inputStats);
-                  return new CloseableIterator<InputRow>()
+                  return new CloseableIterator<>()
                   {
                     private InputRow next = null;
 
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseFrameProcessorFactory.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseFrameProcessorFactory.java
index 33f702aca0cc..4540af086cd5 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseFrameProcessorFactory.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseFrameProcessorFactory.java
@@ -37,7 +37,7 @@ public abstract class BaseFrameProcessorFactory implements FrameProcessorFactory
   @Override
   public TypeReference<Long> getResultTypeReference()
   {
-    return new TypeReference<Long>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessorFactory.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessorFactory.java
index d4ba2120c9c3..468f18214236 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessorFactory.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessorFactory.java
@@ -184,7 +184,7 @@ public ProcessorsAndChannels<Object, Object> makeProcessors(
   @Override
   public TypeReference<Object> getResultTypeReference()
   {
-    return new TypeReference<Object>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java
index d3428a6c3428..8e4f9678d056 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java
@@ -190,7 +190,7 @@ public ListenableFuture<CounterSnapshotsTree> getCounters(String workerId)
             new RequestBuilder(HttpMethod.GET, "/counters").header(HttpHeaders.ACCEPT, contentType),
             new BytesFullResponseHandler()
         ),
-        holder -> deserialize(holder, new TypeReference<CounterSnapshotsTree>() {})
+        holder -> deserialize(holder, new TypeReference<>() {})
     );
   }
 
@@ -216,7 +216,7 @@ public ListenableFuture<Boolean> fetchChannelData(
 
     Futures.addCallback(
         clientFuture,
-        new FutureCallback<FrameFilePartialFetch>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(FrameFilePartialFetch partialFetch)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java
index fd6207662af8..0cc784cf36dd 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java
@@ -144,7 +144,7 @@ public void onStartAsync(AsyncEvent event)
 
     Futures.addCallback(
         dataFuture,
-        new FutureCallback<InputStream>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(final InputStream inputStream)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java
index 4dde34a67f59..84bf1cccb9d4 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java
@@ -74,7 +74,7 @@ private void fetch(
 
     Futures.addCallback(
         fetchFuture,
-        new FutureCallback<Boolean>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(final Boolean lastFetch)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java
index 1635a7964198..15f8d3143483 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java
@@ -47,7 +47,7 @@ public static <T> ListenableFuture<List<T>> allAsList(
     if (cancelOnErrorOrInterrupt) {
       Futures.addCallback(
           retVal,
-          new FutureCallback<List<T>>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(@Nullable List<T> result)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java
index 7112a101c04f..f3cb66fd27a4 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java
@@ -448,9 +448,7 @@ static List<String> decodeList(final String keyName, @Nullable final String list
       try {
         // Not caching this ObjectMapper in a static, because we expect to use it infrequently (once per INSERT
         // query that uses this feature) and there is no need to keep it around longer than that.
-        return new ObjectMapper().readValue(listString, new TypeReference<List<String>>()
-        {
-        });
+        return new ObjectMapper().readValue(listString, new TypeReference<>() {});
       }
       catch (JsonProcessingException e) {
         throw QueryContexts.badValueException(keyName, "CSV or JSON array", listString);
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java
index 0820342ba727..f70dd81caee0 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java
@@ -321,7 +321,7 @@ public static Sequence<Object[]> getResultSequence(
                             .map(mapping -> columnSelectorFactory.makeColumnValueSelector(mapping.getQueryColumn()))
                             .collect(Collectors.toList());
 
-    final Iterable<Object[]> retVal = () -> new Iterator<Object[]>()
+    final Iterable<Object[]> retVal = () -> new Iterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java
index 51e17235203d..981f96fbe2a8 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java
@@ -571,7 +571,7 @@ public void test_doPost_regularUser_fullReport() throws Exception
 
     final List<List<TaskReport.ReportMap>> reportMaps = objectMapper.readValue(
         asyncResponse.baos.toByteArray(),
-        new TypeReference<List<List<TaskReport.ReportMap>>>() {}
+        new TypeReference<>() {}
     );
 
     Assertions.assertEquals(1, reportMaps.size());
@@ -610,7 +610,7 @@ public void test_doPost_regularUser_runtimeError_fullReport() throws Exception
 
     final List<List<TaskReport.ReportMap>> reportMaps = objectMapper.readValue(
         asyncResponse.baos.toByteArray(),
-        new TypeReference<List<List<TaskReport.ReportMap>>>() {}
+        new TypeReference<>() {}
     );
 
     Assertions.assertEquals(1, reportMaps.size());
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java
index 11c33d215170..252419f7227a 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java
@@ -114,7 +114,7 @@ public void test_taskReportDestination() throws IOException
     final TaskReport.ReportMap reportMap =
         JSON_MAPPER.readValue(
             baos.toByteArray(),
-            new TypeReference<TaskReport.ReportMap>() {}
+            new TypeReference<>() {}
         );
 
     Assert.assertEquals(ImmutableSet.of("multiStageQuery", TaskContextReport.REPORT_KEY), reportMap.keySet());
@@ -183,7 +183,7 @@ public void test_durableDestination() throws IOException
     final TaskReport.ReportMap reportMap =
         JSON_MAPPER.readValue(
             baos.toByteArray(),
-            new TypeReference<TaskReport.ReportMap>() {}
+            new TypeReference<>() {}
         );
 
     Assert.assertEquals(ImmutableSet.of("multiStageQuery", TaskContextReport.REPORT_KEY), reportMap.keySet());
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java
index 96957da53213..21e3707f00fd 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java
@@ -120,7 +120,7 @@ public void test_runWithSegments() throws Exception
             )
         ),
         Function.identity(),
-        new ResourceHolder<WritableFrameChannel>()
+        new ResourceHolder<>()
         {
           @Override
           public WritableFrameChannel get()
@@ -214,7 +214,7 @@ public void test_runWithInputChannel() throws Exception
         new DefaultObjectMapper(),
         ReadableInput.channel(inputChannel.readable(), FrameReader.create(signature), stagePartition),
         Function.identity(),
-        new ResourceHolder<WritableFrameChannel>()
+        new ResourceHolder<>()
         {
           @Override
           public WritableFrameChannel get()
diff --git a/extensions-core/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcReader.java b/extensions-core/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcReader.java
index 3f4c0386d46a..de49086cc01b 100644
--- a/extensions-core/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcReader.java
+++ b/extensions-core/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcReader.java
@@ -105,7 +105,7 @@ protected CloseableIterator<OrcStruct> intermediateRowIterator() throws IOExcept
     final RecordReader batchReader = reader.rows(reader.options());
     final OrcMapredRecordReader<OrcStruct> recordReader = new OrcMapredRecordReader<>(batchReader, schema);
     closer.register(recordReader::close);
-    return new CloseableIterator<OrcStruct>()
+    return new CloseableIterator<>()
     {
       final NullWritable key = recordReader.createKey();
       OrcStruct value = null;
diff --git a/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetReader.java b/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetReader.java
index 0bc5f374a0cf..26b5d6d4774b 100644
--- a/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetReader.java
+++ b/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetReader.java
@@ -101,7 +101,7 @@ protected CloseableIterator<Group> intermediateRowIterator() throws IOException
       Thread.currentThread().setContextClassLoader(currentClassLoader);
     }
 
-    return new CloseableIterator<Group>()
+    return new CloseableIterator<>()
     {
       Group value = null;
 
diff --git a/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java b/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java
index f0b9ba0b4a0b..765e12aa39a8 100644
--- a/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java
+++ b/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java
@@ -187,7 +187,7 @@ public Void insertOrUpdate(
   )
   {
     return getDBI().withHandle(
-        new HandleCallback<Void>()
+        new HandleCallback<>()
         {
           @Override
           public Void withHandle(Handle handle) throws Exception
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java
index d7c92a309f12..770fe356e498 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java
@@ -100,7 +100,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)
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
index ecea31c94f74..b299d4f9dd80 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
@@ -70,7 +70,7 @@ public class S3Utils
    */
   public static final String ERROR_ENTITY_TOO_LARGE = "EntityTooLarge";
 
-  public static final Predicate<Throwable> S3RETRY = new Predicate<Throwable>()
+  public static final Predicate<Throwable> S3RETRY = new Predicate<>()
   {
     @Override
     public boolean apply(Throwable e)
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java
index 9ea0e7a8ae03..99d0207bc282 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java
@@ -121,7 +121,7 @@ public ChunkingStorageConnectorParameters<GetObjectRequest> buildInputParams(Str
     builder.maxRetry(config.getMaxRetry());
     builder.retryCondition(S3Utils.S3RETRY);
     builder.objectSupplier((start, end) -> new GetObjectRequest(config.getBucket(), objectPath(path)).withRange(start, end - 1));
-    builder.objectOpenFunction(new ObjectOpenFunction<GetObjectRequest>()
+    builder.objectOpenFunction(new ObjectOpenFunction<>()
     {
       @Override
       public InputStream open(GetObjectRequest object)
diff --git a/extensions-core/s3-extensions/src/test/java/org/apache/druid/data/input/s3/S3InputSourceTest.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/data/input/s3/S3InputSourceTest.java
index bbb1b294abf7..4f14364e7222 100644
--- a/extensions-core/s3-extensions/src/test/java/org/apache/druid/data/input/s3/S3InputSourceTest.java
+++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/data/input/s3/S3InputSourceTest.java
@@ -1352,8 +1352,8 @@ public List<? extends Module> getJacksonModules()
       // See https://github.com/FasterXML/jackson-databind/issues/962.
       return ImmutableList.of(
           new SimpleModule()
-              .addDeserializer(AmazonS3.class, new ItemDeserializer<AmazonS3>())
-              .addDeserializer(AmazonS3ClientBuilder.class, new ItemDeserializer<AmazonS3ClientBuilder>())
+              .addDeserializer(AmazonS3.class, new ItemDeserializer<>())
+              .addDeserializer(AmazonS3ClientBuilder.class, new ItemDeserializer<>())
       );
     }
 
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java
index 1d0c3c4b14fc..2328552efb7b 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java
@@ -159,9 +159,7 @@ public boolean run()
         }
         List<Interval> intervals = HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
             Utils.openInputStream(groupByJob, intervalInfoPath),
-            new TypeReference<List<Interval>>()
-            {
-            }
+            new TypeReference<>() {}
         );
         config.setGranularitySpec(
             new UniformGranularitySpec(
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
index d7e4eb2e10dc..3efb6c5bec7e 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
@@ -272,9 +272,7 @@ public boolean run()
         }
         if (Utils.exists(dimSelectionJob, fileSystem, partitionInfoPath)) {
           List<ShardSpec> specs = HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
-              Utils.openInputStream(dimSelectionJob, partitionInfoPath), new TypeReference<List<ShardSpec>>()
-              {
-              }
+              Utils.openInputStream(dimSelectionJob, partitionInfoPath), new TypeReference<>() {}
           );
 
           List<HadoopyShardSpec> actualSpecs = Lists.newArrayListWithExpectedSize(specs.size());
@@ -619,7 +617,7 @@ protected abstract void innerReduce(
 
     private static Iterable<DimValueCount> combineRows(Iterable<Text> input)
     {
-      final Comparator<List<String>> dimsComparator = new Comparator<List<String>>()
+      final Comparator<List<String>> dimsComparator = new Comparator<>()
       {
         @Override
         public int compare(List<String> o1, List<String> o2)
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
index 246a068e4609..bb830afd244f 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
@@ -488,7 +488,7 @@ Optional<Iterable<Bucket>> getAllBuckets()
                     return FunctionalIterable
                         .create(specs)
                         .transform(
-                            new Function<HadoopyShardSpec, Bucket>()
+                            new Function<>()
                             {
                               int i = 0;
 
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
index 6b1b84d02d7a..7639ba66b5f6 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
@@ -179,7 +179,7 @@ public static void setupClasspath(
 
   public static Predicate<Throwable> shouldRetryPredicate()
   {
-    return new Predicate<Throwable>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(Throwable input)
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/Utils.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/Utils.java
index 19dfe3093a52..79ed14ad961c 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/Utils.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/Utils.java
@@ -232,9 +232,7 @@ private static void checkAppSuccessFromYarnRMOnce(
     log.info("App status response from YARN RM: " + res.getContentAsString());
     Map<String, Object> respMap = HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
         res.getContentAsString(),
-        new TypeReference<Map<String, Object>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     Map<String, Object> appMap = (Map<String, Object>) respMap.get("app");
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
index 0937c19bd569..e6d39284c5af 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
@@ -139,7 +139,7 @@ public RecordReader<NullWritable, InputRow> createRecordReader(
     return new DatasourceRecordReader();
   }
 
-  private Supplier<org.apache.hadoop.mapred.InputFormat> supplier = new Supplier<org.apache.hadoop.mapred.InputFormat>()
+  private Supplier<org.apache.hadoop.mapred.InputFormat> supplier = new Supplier<>()
   {
     @Override
     public org.apache.hadoop.mapred.InputFormat get()
@@ -253,7 +253,7 @@ public static List<String> getDataSources(final Configuration conf) throws IOExc
 
     return HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
         currentDatasources,
-        new TypeReference<List<String>>() {}
+        new TypeReference<>() {}
     );
   }
 
@@ -286,7 +286,7 @@ public static List<WindowedDataSegment> getSegments(final Configuration conf, fi
   {
     return HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
         conf.get(StringUtils.format("%s.%s", CONF_SEGMENTS, dataSource)),
-        new TypeReference<List<WindowedDataSegment>>() {}
+        new TypeReference<>() {}
     );
   }
 
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputSplit.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputSplit.java
index e842adeed1a7..a2cd03e2a22e 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputSplit.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputSplit.java
@@ -91,9 +91,7 @@ public void readFields(DataInput in) throws IOException
     in.readFully(buf);
     segments = HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
         buf,
-        new TypeReference<List<WindowedDataSegment>>()
-        {
-        }
+        new TypeReference<>() {}
     );
     locations = new String[in.readInt()];
     for (int i = 0; i < locations.length; i++) {
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java
index 5ef56583f7c6..b604937b1b01 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java
@@ -100,7 +100,7 @@ public void initialize(InputSplit split, final TaskAttemptContext context) throw
 
     List<WindowedCursorFactory> adapters = Lists.transform(
         segments,
-        new Function<WindowedDataSegment, WindowedCursorFactory>()
+        new Function<>()
         {
           @Override
           public WindowedCursorFactory apply(WindowedDataSegment segment)
@@ -205,7 +205,7 @@ public SegmentReader(
       Sequence<InputRow> rows = Sequences.concat(
           Iterables.transform(
               cursorFactories,
-              new Function<WindowedCursorFactory, Sequence<InputRow>>()
+              new Function<>()
               {
                 @Nullable
                 @Override
@@ -247,7 +247,7 @@ public Sequence<InputRow> apply(WindowedCursorFactory windowed)
                         @Override
                         public Iterator<InputRow> iterator()
                         {
-                          return new Iterator<InputRow>()
+                          return new Iterator<>()
                           {
                             @Override
                             public boolean hasNext()
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/FSSpideringIterator.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/FSSpideringIterator.java
index 9c76cdd6c55a..8355b354989e 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/FSSpideringIterator.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/FSSpideringIterator.java
@@ -50,7 +50,7 @@ public static FSSpideringIterator spiderPathPropagateExceptions(FileSystem fs, P
 
   public static Iterable<FileStatus> spiderIterable(final FileSystem fs, final Path path)
   {
-    return new Iterable<FileStatus>()
+    return new Iterable<>()
     {
       @Override
       public Iterator<FileStatus> iterator()
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java
index 241746ca58d6..a53850704e65 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java
@@ -491,7 +491,7 @@ public void setUp() throws Exception
     dataFile = temporaryFolder.newFile();
     tmpDir = temporaryFolder.newFolder();
 
-    HashMap<String, Object> inputSpec = new HashMap<String, Object>();
+    HashMap<String, Object> inputSpec = new HashMap<>();
     inputSpec.put("paths", dataFile.getCanonicalPath());
     inputSpec.put("type", "static");
     if (inputFormatName != null) {
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java
index 530c0f657a51..d7825aa01478 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java
@@ -311,7 +311,7 @@ public void progress()
   private static class HadoopDruidIndexerConfigSpy extends HadoopDruidIndexerConfig
   {
 
-    private Map<String, String> jobProperties = new HashMap<String, String>();
+    private Map<String, String> jobProperties = new HashMap<>();
 
     public HadoopDruidIndexerConfigSpy(HadoopDruidIndexerConfig delegate)
     {
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputFormatTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputFormatTest.java
index 2da6b210e87e..562ba7f19abc 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputFormatTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputFormatTest.java
@@ -213,7 +213,7 @@ private static <T extends Configuration> T populateConfiguration(
     return conf;
   }
 
-  private Supplier<InputFormat> testFormatter = new Supplier<InputFormat>()
+  private Supplier<InputFormat> testFormatter = new Supplier<>()
   {
     @Override
     public InputFormat get()
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java
index 896ee8460741..f028eeeeec32 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java
@@ -63,7 +63,7 @@ public void testNonEmptyDirs()
                   FileSystem.getLocal(new Configuration()),
                   new Path(baseDir.toString())
               ),
-              new Function<FileStatus, String>()
+              new Function<>()
               {
                 @Override
                 public String apply(@Nullable FileStatus input)
@@ -111,7 +111,7 @@ public void testEmptyDirs()
                   FileSystem.getLocal(new Configuration()),
                   new Path(baseDir.toString())
               ),
-              new Function<FileStatus, String>()
+              new Function<>()
               {
                 @Override
                 public String apply(@Nullable FileStatus input)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java
index e319dc242660..23fce6740c5d 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java
@@ -106,9 +106,7 @@ public SeekableStreamDataSourceMetadata getCheckpointMetadata()
   @Override
   public TypeReference<Boolean> getReturnTypeReference()
   {
-    return new TypeReference<Boolean>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockListAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockListAction.java
index c60c57407984..cc7c2907fd18 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockListAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockListAction.java
@@ -30,7 +30,7 @@ public class LockListAction implements TaskAction<List<TaskLock>>
   @Override
   public TypeReference<List<TaskLock>> getReturnTypeReference()
   {
-    return new TypeReference<List<TaskLock>>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockReleaseAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockReleaseAction.java
index 32974117cc7b..63f97bae69c7 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockReleaseAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockReleaseAction.java
@@ -46,7 +46,7 @@ public Interval getInterval()
   @Override
   public TypeReference<Void> getReturnTypeReference()
   {
-    return new TypeReference<Void>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/MarkSegmentsAsUnusedAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/MarkSegmentsAsUnusedAction.java
index 35a8ed3e35c0..a3341022f625 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/MarkSegmentsAsUnusedAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/MarkSegmentsAsUnusedAction.java
@@ -55,9 +55,7 @@ public Interval getInterval()
   @Override
   public TypeReference<Integer> getReturnTypeReference()
   {
-    return new TypeReference<Integer>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/ResetDataSourceMetadataAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/ResetDataSourceMetadataAction.java
index 42259b381830..1310b0f69acf 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/ResetDataSourceMetadataAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/ResetDataSourceMetadataAction.java
@@ -53,9 +53,7 @@ public DataSourceMetadata getResetMetadata()
   @Override
   public TypeReference<Boolean> getReturnTypeReference()
   {
-    return new TypeReference<Boolean>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsByIdAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsByIdAction.java
index a4ca90ac62ed..e20096745a7b 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsByIdAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsByIdAction.java
@@ -62,9 +62,7 @@ public Set<String> getSegmentIds()
   @Override
   public TypeReference<Set<DataSegment>> getReturnTypeReference()
   {
-    return new TypeReference<Set<DataSegment>>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUnusedSegmentsAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUnusedSegmentsAction.java
index fb58328b3d76..a43540cb98ec 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUnusedSegmentsAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUnusedSegmentsAction.java
@@ -91,7 +91,7 @@ public DateTime getMaxUsedStatusLastUpdatedTime()
   @Override
   public TypeReference<List<DataSegment>> getReturnTypeReference()
   {
-    return new TypeReference<List<DataSegment>>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedFromSegmentIdsAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedFromSegmentIdsAction.java
index 4f54131dee6f..2f86f568c450 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedFromSegmentIdsAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedFromSegmentIdsAction.java
@@ -59,9 +59,7 @@ public Set<String> getSegmentIds()
   @Override
   public TypeReference<UpgradedFromSegmentsResponse> getReturnTypeReference()
   {
-    return new TypeReference<UpgradedFromSegmentsResponse>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedToSegmentIdsAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedToSegmentIdsAction.java
index 256a663a1a47..ab2547ecb7ef 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedToSegmentIdsAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedToSegmentIdsAction.java
@@ -64,9 +64,7 @@ public Set<String> getSegmentIds()
   @Override
   public TypeReference<UpgradedToSegmentsResponse> getReturnTypeReference()
   {
-    return new TypeReference<UpgradedToSegmentsResponse>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUsedSegmentsAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUsedSegmentsAction.java
index 473976efd1ea..51bec50a600e 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUsedSegmentsAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUsedSegmentsAction.java
@@ -107,7 +107,7 @@ public Segments getVisibility()
   @Override
   public TypeReference<Collection<DataSegment>> getReturnTypeReference()
   {
-    return new TypeReference<Collection<DataSegment>>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java
index 902dad5dd879..c9581318e711 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java
@@ -184,9 +184,7 @@ public TaskLockType getTaskLockType()
   @Override
   public TypeReference<SegmentIdWithShardSpec> getReturnTypeReference()
   {
-    return new TypeReference<SegmentIdWithShardSpec>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockAcquireAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockAcquireAction.java
index e17af3847ca8..ac922a6aae25 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockAcquireAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockAcquireAction.java
@@ -93,9 +93,7 @@ public long getTimeoutMs()
   @Override
   public TypeReference<LockResult> getReturnTypeReference()
   {
-    return new TypeReference<LockResult>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockTryAcquireAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockTryAcquireAction.java
index c5084eb61cda..b54004bd3574 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockTryAcquireAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockTryAcquireAction.java
@@ -86,9 +86,7 @@ public Set<Integer> getPartitionIds()
   @Override
   public TypeReference<List<LockResult>> getReturnTypeReference()
   {
-    return new TypeReference<List<LockResult>>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java
index b2a5ee5843be..af3f535422b6 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java
@@ -56,7 +56,7 @@ public Set<DataSegment> getSegments()
   @Override
   public TypeReference<Void> getReturnTypeReference()
   {
-    return new TypeReference<Void>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java
index 326907c8f0a5..84445d3968a5 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java
@@ -56,9 +56,7 @@ public Set<DataSegment> getSegments()
   @Override
   public TypeReference<Void> getReturnTypeReference()
   {
-    return new TypeReference<Void>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalAppendAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalAppendAction.java
index 2326176885b3..ea3a4fd36d2a 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalAppendAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalAppendAction.java
@@ -132,9 +132,7 @@ public SegmentSchemaMapping getSegmentSchemaMapping()
   @Override
   public TypeReference<SegmentPublishResult> getReturnTypeReference()
   {
-    return new TypeReference<SegmentPublishResult>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java
index e8dd472cf31d..fb988e78e5d4 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java
@@ -169,9 +169,7 @@ public SegmentSchemaMapping getSegmentSchemaMapping()
   @Override
   public TypeReference<SegmentPublishResult> getReturnTypeReference()
   {
-    return new TypeReference<SegmentPublishResult>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   /**
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalReplaceAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalReplaceAction.java
index 572f4aa3f284..6546ed80d9d9 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalReplaceAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalReplaceAction.java
@@ -105,9 +105,7 @@ public SegmentSchemaMapping getSegmentSchemaMapping()
   @Override
   public TypeReference<SegmentPublishResult> getReturnTypeReference()
   {
-    return new TypeReference<SegmentPublishResult>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   /**
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockAcquireAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockAcquireAction.java
index 42f4e40d0e64..1b9f60353a6f 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockAcquireAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockAcquireAction.java
@@ -76,9 +76,7 @@ public long getTimeoutMs()
   @Override
   public TypeReference<TaskLock> getReturnTypeReference()
   {
-    return new TypeReference<TaskLock>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockTryAcquireAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockTryAcquireAction.java
index b2dc6e3d5e62..5bbb7999c61c 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockTryAcquireAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockTryAcquireAction.java
@@ -65,9 +65,7 @@ public Interval getInterval()
   @Override
   public TypeReference<TaskLock> getReturnTypeReference()
   {
-    return new TypeReference<TaskLock>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateLocationAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateLocationAction.java
index 2c7c265a7f40..6bce838fc5c0 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateLocationAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateLocationAction.java
@@ -48,9 +48,7 @@ public TaskLocation getTaskLocation()
   @Override
   public TypeReference<Void> getReturnTypeReference()
   {
-    return new TypeReference<Void>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateStatusAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateStatusAction.java
index d02020acb9d0..e5170c79eac2 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateStatusAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateStatusAction.java
@@ -68,9 +68,7 @@ public TaskStatus getStatusFull()
   @Override
   public TypeReference<Void> getReturnTypeReference()
   {
-    return new TypeReference<Void>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
index 0f124389399e..185e6e014c69 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
@@ -639,7 +639,7 @@ public static Function<Set<DataSegment>, Set<DataSegment>> addCompactionStateToS
                                           : new ClientCompactionTaskTransformSpec(ingestionSpec.getDataSchema().getTransformSpec().getFilter()).asMap(toolbox.getJsonMapper());
       List<Object> metricsSpec = ingestionSpec.getDataSchema().getAggregators() == null
                                  ? null
-                                 : toolbox.getJsonMapper().convertValue(ingestionSpec.getDataSchema().getAggregators(), new TypeReference<List<Object>>() {});
+                                 : toolbox.getJsonMapper().convertValue(ingestionSpec.getDataSchema().getAggregators(), new TypeReference<>() {});
 
       return CompactionState.addCompactionStateToSegments(
           tuningConfig.getPartitionsSpec(),
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
index 81721cabb44b..319c1a7ab691 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
@@ -921,9 +921,7 @@ public String[] runTask(String[] args) throws Exception
   public static class HadoopRenameSegmentIndexFilesRunner
   {
     TypeReference<List<DataSegmentAndIndexZipFilePath>> LIST_DATA_SEGMENT_AND_INDEX_ZIP_FILE_PATH =
-        new TypeReference<List<DataSegmentAndIndexZipFilePath>>()
-        {
-        };
+        new TypeReference<>() {};
 
     public void runTask(String[] args) throws Exception
     {
@@ -963,9 +961,7 @@ public void runTask(String[] args) throws Exception
   public static class HadoopIndexerGeneratorCleanupRunner
   {
     TypeReference<List<DataSegmentAndIndexZipFilePath>> LIST_DATA_SEGMENT_AND_INDEX_ZIP_FILE_PATH =
-        new TypeReference<List<DataSegmentAndIndexZipFilePath>>()
-        {
-        };
+        new TypeReference<>() {};
 
     public void runTask(String[] args) throws Exception
     {
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
index a15b77b90d18..a239025ee05d 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
@@ -81,7 +81,7 @@ public List<String> getHadoopDependencyCoordinates()
   // This is only used for classpath isolation in the runTask isolation stuff, so it shooouuullldddd be ok.
   /** {@link #buildClassLoader(TaskToolbox)} has outdated javadocs referencing this field, TODO update */
   @SuppressWarnings("unused")
-  protected static final Predicate<URL> IS_DRUID_URL = new Predicate<URL>()
+  protected static final Predicate<URL> IS_DRUID_URL = new Predicate<>()
   {
     @Override
     public boolean apply(@Nullable URL input)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunner.java
index 96e4292926c2..579c1e492c38 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunner.java
@@ -247,7 +247,7 @@ private void submitNewTask(
     final ListenableFuture<SubTaskCompleteEvent<SubTaskType>> future = taskMonitor.submit(spec);
     Futures.addCallback(
         future,
-        new FutureCallback<SubTaskCompleteEvent<SubTaskType>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(SubTaskCompleteEvent<SubTaskType> completeEvent)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityParallelIndexTaskRunner.java
index f297bfc2002f..686bf9e5dc8a 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityParallelIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityParallelIndexTaskRunner.java
@@ -68,7 +68,7 @@ SubTaskSpec<PartialDimensionCardinalityTask> createSubTaskSpec(
       ParallelIndexIngestionSpec subTaskIngestionSpec
   )
   {
-    return new SubTaskSpec<PartialDimensionCardinalityTask>(
+    return new SubTaskSpec<>(
         id,
         groupId,
         supervisorTaskId,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionParallelIndexTaskRunner.java
index a6c332b3907d..d18bdae97486 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionParallelIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionParallelIndexTaskRunner.java
@@ -295,7 +295,7 @@ SubTaskSpec<PartialDimensionDistributionTask> createSubTaskSpec(
       ParallelIndexIngestionSpec subTaskIngestionSpec
   )
   {
-    return new SubTaskSpec<PartialDimensionDistributionTask>(
+    return new SubTaskSpec<>(
         id,
         groupId,
         supervisorTaskId,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialGenericSegmentMergeParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialGenericSegmentMergeParallelIndexTaskRunner.java
index 8babf50d8265..f469385ec546 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialGenericSegmentMergeParallelIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialGenericSegmentMergeParallelIndexTaskRunner.java
@@ -83,7 +83,7 @@ SubTaskSpec<PartialGenericSegmentMergeTask> newTaskSpec(PartialSegmentMergeIOCon
         getTuningConfig()
     );
     final String subtaskSpecId = getBaseSubtaskSpecName() + "_" + getAndIncrementNextSpecId();
-    return new SubTaskSpec<PartialGenericSegmentMergeTask>(
+    return new SubTaskSpec<>(
         subtaskSpecId,
         getGroupId(),
         getTaskId(),
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateParallelIndexTaskRunner.java
index 3bb9a1544f5d..dfd7e27466f2 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateParallelIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateParallelIndexTaskRunner.java
@@ -67,7 +67,7 @@ SubTaskSpec<PartialHashSegmentGenerateTask> createSubTaskSpec(
       ParallelIndexIngestionSpec subTaskIngestionSpec
   )
   {
-    return new SubTaskSpec<PartialHashSegmentGenerateTask>(
+    return new SubTaskSpec<>(
         id,
         groupId,
         supervisorTaskId,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialRangeSegmentGenerateParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialRangeSegmentGenerateParallelIndexTaskRunner.java
index d37b432965b3..c6049e2379cb 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialRangeSegmentGenerateParallelIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialRangeSegmentGenerateParallelIndexTaskRunner.java
@@ -66,7 +66,7 @@ SubTaskSpec<PartialRangeSegmentGenerateTask> createSubTaskSpec(
       ParallelIndexIngestionSpec subTaskIngestionSpec
   )
   {
-    return new SubTaskSpec<PartialRangeSegmentGenerateTask>(
+    return new SubTaskSpec<>(
         id,
         groupId,
         supervisorTaskId,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidSegmentReader.java b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidSegmentReader.java
index d2da00f38c87..2e4d64799aaa 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidSegmentReader.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidSegmentReader.java
@@ -195,7 +195,7 @@ static CloseableIterator<Map<String, Object>> makeCloseableIteratorFromSequenceA
       final CleanableFile segmentFile
   )
   {
-    return new CloseableIterator<Map<String, Object>>()
+    return new CloseableIterator<>()
     {
       Yielder<Map<String, Object>> rowYielder = Yielders.each(sequence);
 
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidTombstoneSegmentReader.java b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidTombstoneSegmentReader.java
index a8b98dd7d0f8..39a0bc3848bd 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidTombstoneSegmentReader.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidTombstoneSegmentReader.java
@@ -47,7 +47,7 @@ public DruidTombstoneSegmentReader(
   @Override
   protected CloseableIterator<Map<String, Object>> intermediateRowIterator()
   {
-    return new CloseableIterator<Map<String, Object>>()
+    return new CloseableIterator<>()
     {
       @Override
       public void close()
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/input/GeneratorInputSource.java b/indexing-service/src/main/java/org/apache/druid/indexing/input/GeneratorInputSource.java
index b5dc706f3747..6228d341cf4c 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/input/GeneratorInputSource.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/input/GeneratorInputSource.java
@@ -165,7 +165,7 @@ protected InputSourceReader fixedFormatReader(InputRowSchema inputRowSchema, @Nu
       @Override
       public CloseableIterator<InputRow> read(InputStats inputStats)
       {
-        return CloseableIterators.withEmptyBaggage(new Iterator<InputRow>()
+        return CloseableIterators.withEmptyBaggage(new Iterator<>()
         {
           int rowCount = 0;
           private final DataGenerator generator = makeGenerator();
@@ -191,7 +191,7 @@ public InputRow next()
       @Override
       public CloseableIterator<InputRowListPlusRawValues> sample()
       {
-        return CloseableIterators.withEmptyBaggage(new Iterator<InputRowListPlusRawValues>()
+        return CloseableIterators.withEmptyBaggage(new Iterator<>()
         {
           int rowCount = 0;
           private final DataGenerator generator = makeGenerator();
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
index 1a34c76e33fb..d51d919a295e 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
@@ -168,7 +168,7 @@ public ListenableFuture<TaskStatus> run(final Task task)
           new ForkingTaskRunnerWorkItem(
             task,
             exec.submit(
-              new Callable<TaskStatus>() {
+              new Callable<>() {
                 @Override
                 public TaskStatus call()
                 {
@@ -244,7 +244,9 @@ public TaskStatus call()
 
                         command.add(config.getJavaCommand());
 
-                        command.addAll(STRONG_ENCAPSULATION_PROPERTIES);
+                        if (JvmUtils.majorVersion() >= 11) {
+                          command.addAll(STRONG_ENCAPSULATION_PROPERTIES);
+                        }
 
                         command.add("-cp");
                         command.add(taskClasspath);
@@ -271,7 +273,7 @@ public TaskStatus call()
                         try {
                           List<String> taskJavaOptsArray = jsonMapper.convertValue(
                               task.getContextValue(ForkingTaskRunnerConfig.JAVA_OPTS_ARRAY_PROPERTY),
-                              new TypeReference<List<String>>() {}
+                              new TypeReference<>() {}
                           );
                           if (taskJavaOptsArray != null) {
                             command.addAll(taskJavaOptsArray);
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java
index 3608f0238992..683b9e805492 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java
@@ -57,30 +57,24 @@
 public class MetadataTaskStorage implements TaskStorage
 {
 
-  private static final MetadataStorageActionHandlerTypes<Task, TaskStatus, TaskAction, TaskLock> TASK_TYPES = new MetadataStorageActionHandlerTypes<Task, TaskStatus, TaskAction, TaskLock>()
+  private static final MetadataStorageActionHandlerTypes<Task, TaskStatus, TaskAction, TaskLock> TASK_TYPES = new MetadataStorageActionHandlerTypes<>()
   {
     @Override
     public TypeReference<Task> getEntryType()
     {
-      return new TypeReference<Task>()
-      {
-      };
+      return new TypeReference<>() {};
     }
 
     @Override
     public TypeReference<TaskStatus> getStatusType()
     {
-      return new TypeReference<TaskStatus>()
-      {
-      };
+      return new TypeReference<>() {};
     }
 
     @Override
     public TypeReference<TaskLock> getLockType()
     {
-      return new TypeReference<TaskLock>()
-      {
-      };
+      return new TypeReference<>() {};
     }
   };
 
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java
index 4fd7b57f38b5..4a4f0a084649 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java
@@ -248,7 +248,7 @@ public void start()
                 }
                 Futures.addCallback(
                     addWorker(worker),
-                    new FutureCallback<ZkWorker>()
+                    new FutureCallback<>()
                     {
                       @Override
                       public void onSuccess(ZkWorker zkWorker)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java
index 2c1b78d3adab..1e1a43994925 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java
@@ -146,7 +146,7 @@ public TaskLockboxSyncResult syncFromStorage()
         }
       }
       // Sort locks by version, so we add them back in the order they were acquired.
-      final Ordering<Pair<Task, TaskLock>> byVersionOrdering = new Ordering<Pair<Task, TaskLock>>()
+      final Ordering<Pair<Task, TaskLock>> byVersionOrdering = new Ordering<>()
       {
         @Override
         public int compare(Pair<Task, TaskLock> left, Pair<Task, TaskLock> right)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java
index ea8f1a56ed85..94f691eecb75 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java
@@ -741,7 +741,7 @@ private void attachCallbacks(final Task task, final ListenableFuture<TaskStatus>
 
     Futures.addCallback(
         statusFuture,
-        new FutureCallback<TaskStatus>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(final TaskStatus status)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ThreadingTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ThreadingTaskRunner.java
index 70b4a927af90..909163049f27 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ThreadingTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ThreadingTaskRunner.java
@@ -151,7 +151,8 @@ public ListenableFuture<TaskStatus> run(Task task)
               new ThreadingTaskRunnerWorkItem(
                   task,
                   taskExecutor.submit(
-                      new Callable<TaskStatus>() {
+                      new Callable<>()
+                      {
                         @Override
                         public TaskStatus call()
                         {
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java
index 6990973e564f..0d715b53549f 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java
@@ -117,7 +117,7 @@ public PendingTaskBasedWorkerProvisioningStrategy(
         config,
         workerConfigRef,
         provisioningSchedulerConfig,
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -178,7 +178,7 @@ public synchronized boolean doProvision()
       final Collection<String> workerNodeIds = getWorkerNodeIDs(
           Collections2.transform(
               workers,
-              new Function<ImmutableWorkerInfo, Worker>()
+              new Function<>()
               {
                 @Override
                 public Worker apply(ImmutableWorkerInfo input)
@@ -378,7 +378,7 @@ public synchronized boolean doTerminate()
         final Collection<String> laziestWorkerIps =
             Collections2.transform(
                 runner.markWorkersLazy(isLazyWorker, maxWorkersToTerminate),
-                new Function<Worker, String>()
+                new Function<>()
                 {
                   @Override
                   public String apply(Worker zkWorker)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningUtil.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningUtil.java
index 6eb7e05305cf..162597e08b42 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningUtil.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningUtil.java
@@ -29,7 +29,7 @@ public static Predicate<ImmutableWorkerInfo> createValidWorkerPredicate(
       final SimpleWorkerProvisioningConfig config
   )
   {
-    return new Predicate<ImmutableWorkerInfo>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(ImmutableWorkerInfo worker)
@@ -49,7 +49,7 @@ public static Predicate<ImmutableWorkerInfo> createLazyWorkerPredicate(
   {
     final Predicate<ImmutableWorkerInfo> isValidWorker = createValidWorkerPredicate(config);
 
-    return new Predicate<ImmutableWorkerInfo>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(ImmutableWorkerInfo worker)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java
index afdaa57c565d..fc0397393df7 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java
@@ -68,7 +68,7 @@ public SimpleWorkerProvisioningStrategy(
         config,
         workerConfigRef,
         provisioningSchedulerConfig,
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -133,7 +133,7 @@ public synchronized boolean doProvision()
           Lists.newArrayList(
               Iterables.transform(
                   workers,
-                  new Function<ImmutableWorkerInfo, String>()
+                  new Function<>()
                   {
                     @Override
                     public String apply(ImmutableWorkerInfo input)
@@ -197,7 +197,7 @@ public synchronized boolean doTerminate()
               Lists.newArrayList(
                   Iterables.transform(
                       runner.getLazyWorkers(),
-                      new Function<Worker, String>()
+                      new Function<>()
                       {
                         @Override
                         public String apply(Worker input)
@@ -223,7 +223,7 @@ public String apply(Worker input)
           final Collection<String> laziestWorkerIps =
               Collections2.transform(
                   runner.markWorkersLazy(isLazyWorker, excessWorkers),
-                  new Function<Worker, String>()
+                  new Function<>()
                   {
                     @Override
                     public String apply(Worker worker)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java
index 6294318ec54c..9d177c654109 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java
@@ -62,9 +62,7 @@ public class WorkerHolder
 {
   private static final EmittingLogger log = new EmittingLogger(WorkerHolder.class);
 
-  public static final TypeReference<ChangeRequestsSnapshot<WorkerHistoryItem>> WORKER_SYNC_RESP_TYPE_REF = new TypeReference<ChangeRequestsSnapshot<WorkerHistoryItem>>()
-  {
-  };
+  public static final TypeReference<ChangeRequestsSnapshot<WorkerHistoryItem>> WORKER_SYNC_RESP_TYPE_REF = new TypeReference<>() {};
 
 
   private final Worker worker;
@@ -318,7 +316,7 @@ public ChangeRequestHttpSyncer<WorkerHistoryItem> getUnderlyingSyncer()
 
   public ChangeRequestHttpSyncer.Listener<WorkerHistoryItem> createSyncListener()
   {
-    return new ChangeRequestHttpSyncer.Listener<WorkerHistoryItem>()
+    return new ChangeRequestHttpSyncer.Listener<>()
     {
       @Override
       public void fullSync(List<WorkerHistoryItem> changes)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java
index 84bf260b6f99..fc2b00ad6f58 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java
@@ -512,7 +512,7 @@ public Response doAction(final TaskActionHolder holder)
   {
     return asLeaderWith(
         taskMaster.getTaskActionClient(holder.getTask()),
-        new Function<TaskActionClient, Response>()
+        new Function<>()
         {
           @Override
           public Response apply(TaskActionClient taskActionClient)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java
index 7e9aaa927407..c4be66719913 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java
@@ -64,7 +64,7 @@ public ContainerRequest filter(ContainerRequest request)
                .get(
                    Iterables.indexOf(
                        request.getPathSegments(),
-                       new Predicate<PathSegment>()
+                       new Predicate<>()
                        {
                          @Override
                          public boolean apply(PathSegment input)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/RecordSupplierInputSource.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/RecordSupplierInputSource.java
index b9bef3c7314f..96dda8ca88a7 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/RecordSupplierInputSource.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/RecordSupplierInputSource.java
@@ -137,7 +137,7 @@ protected InputSourceReader formattableReader(
    */
   CloseableIterator<InputEntity> createEntityIterator()
   {
-    return new CloseableIterator<InputEntity>()
+    return new CloseableIterator<>()
     {
       private Iterator<OrderedPartitionableRecord<PartitionIdType, SequenceOffsetType, RecordType>> recordIterator;
       private Iterator<? extends ByteEntity> bytesIterator;
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClient.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClient.java
index 7fd282e44ce2..484ad15f7cd6 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClient.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClient.java
@@ -32,7 +32,7 @@
 public interface SeekableStreamIndexTaskClient<PartitionIdType, SequenceOffsetType>
 {
   TypeReference<List<ParseExceptionReport>> TYPE_REFERENCE_LIST_PARSE_EXCEPTION_REPORT =
-      new TypeReference<List<ParseExceptionReport>>() {};
+      new TypeReference<>() {};
 
   /**
    * Retrieve current task checkpoints.
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientAsyncImpl.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientAsyncImpl.java
index 5de1cb50a971..6af2735e995b 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientAsyncImpl.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientAsyncImpl.java
@@ -412,7 +412,7 @@ private ListenableFuture<Map<PartitionIdType, SequenceOffsetType>> getOffsetsWhe
                   () ->
                       Futures.addCallback(
                           getOffsetsWhenPaused(taskId, retryPolicy),
-                          new FutureCallback<Map<PartitionIdType, SequenceOffsetType>>()
+                          new FutureCallback<>()
                           {
                             @Override
                             public void onSuccess(@Nullable Map<PartitionIdType, SequenceOffsetType> result)
@@ -567,7 +567,7 @@ public ListenableFuture<T> go()
               client.asyncRequest(requestBuilder.timeout(httpTimeout), responseHandler),
               responseTransformer
           ),
-          new FutureCallback<T>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(@Nullable T result)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientFactory.java
index c3b4e69f8327..92acb3a33296 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientFactory.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientFactory.java
@@ -70,7 +70,7 @@ public SeekableStreamIndexTaskClient<PartitionIdType, SequenceOffsetType> build(
         tuningConfig.getChatRetries()
     );
 
-    return new SeekableStreamIndexTaskClientAsyncImpl<PartitionIdType, SequenceOffsetType>(
+    return new SeekableStreamIndexTaskClientAsyncImpl<>(
         dataSource,
         new ServiceClientFactoryImpl(httpClient, connectExec),
         taskInfoProvider,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
index a2db12d005e9..fddd8f8e4536 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
@@ -711,7 +711,7 @@ public void run()
               if (isPersistRequired) {
                 Futures.addCallback(
                     driver.persistAsync(committerSupplier.get()),
-                    new FutureCallback<Object>()
+                    new FutureCallback<>()
                     {
                       @Override
                       public void onSuccess(@Nullable Object result)
@@ -1022,7 +1022,7 @@ private void publishAndRegisterHandoff(SequenceMetadata<PartitionIdType, Sequenc
 
     Futures.addCallback(
         publishFuture,
-        new FutureCallback<SegmentsAndCommitMetadata>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(SegmentsAndCommitMetadata publishedSegmentsAndCommitMetadata)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpec.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpec.java
index 4705f3337229..dddb46012891 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpec.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpec.java
@@ -193,7 +193,7 @@ public SeekableStreamSamplerInputSourceReader(InputRowParser parser)
     @Override
     public CloseableIterator<InputRow> read()
     {
-      return new CloseableIterator<InputRow>()
+      return new CloseableIterator<>()
       {
 
         @Override
@@ -225,7 +225,7 @@ public CloseableIterator<InputRow> read(InputStats inputStats)
     @Override
     public CloseableIterator<InputRowListPlusRawValues> sample()
     {
-      return new CloseableIterator<InputRowListPlusRawValues>()
+      return new CloseableIterator<>()
       {
         @Override
         public boolean hasNext()
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
index 8b4845b08d07..43b3ba895bb9 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
@@ -2064,7 +2064,7 @@ private void discoverTasks() throws ExecutionException, InterruptedException
           futures.add(
               Futures.transform(
                   getStatusAndPossiblyEndOffsets(taskId),
-                  new Function<Pair<SeekableStreamIndexTaskRunner.Status, Map<PartitionIdType, SequenceOffsetType>>, Boolean>()
+                  new Function<>()
                   {
                     @Override
                     public Boolean apply(Pair<SeekableStreamIndexTaskRunner.Status, Map<PartitionIdType, SequenceOffsetType>> pair)
@@ -2100,7 +2100,8 @@ public Boolean apply(Pair<SeekableStreamIndexTaskRunner.Status, Map<PartitionIdT
                             if (sequence.equals(getEndOfPartitionMarker())) {
                               log.info(
                                   "Got end-of-partition(EOS) marker for partition[%s] from task[%s] in discoverTasks, clearing partition offset to refetch from metadata.",
-                                  partition, taskId
+                                  partition,
+                                  taskId
                               );
                               endOffsetsAreInvalid = true;
                               partitionOffsets.put(partition, getNotSetMarker());
@@ -2603,7 +2604,7 @@ private void verifySameSequenceNameForAllTasksInGroup(int groupId)
   private ListenableFuture<Void> stopTask(final String id, final boolean publish)
   {
     return Futures.transform(
-        taskClient.stopAsync(id, publish), new Function<Boolean, Void>()
+        taskClient.stopAsync(id, publish), new Function<>()
         {
           @Nullable
           @Override
@@ -3155,7 +3156,7 @@ private void updateTaskStatus() throws ExecutionException, InterruptedException
           futureTaskIds.add(taskId);
           futures.add(
               Futures.transform(
-                  taskClient.getStartTimeAsync(taskId), new Function<DateTime, Boolean>()
+                  taskClient.getStartTimeAsync(taskId), new Function<>()
                   {
                     @Override
                     public Boolean apply(@Nullable DateTime startTime)
@@ -3377,7 +3378,7 @@ public Map<PartitionIdType, SequenceOffsetType> apply(@Nullable Object input)
 
     return Futures.transformAsync(
         FutureUtils.coalesce(pauseFutures),
-        new AsyncFunction<List<Either<Throwable, Map<PartitionIdType, SequenceOffsetType>>>, Map<PartitionIdType, SequenceOffsetType>>()
+        new AsyncFunction<>()
         {
           @Override
           public ListenableFuture<Map<PartitionIdType, SequenceOffsetType>> apply(List<Either<Throwable, Map<PartitionIdType, SequenceOffsetType>>> input)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java
index a1c131ad0f49..8b1153376791 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java
@@ -245,7 +245,7 @@ private void addRunningTask(final Task task, final ListenableFuture<TaskStatus>
     runningTasks.put(task.getId(), new TaskDetails(task));
     Futures.addCallback(
         future,
-        new FutureCallback<TaskStatus>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(TaskStatus result)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java
index 8784ee044618..44a2d5508ca5 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java
@@ -176,7 +176,7 @@ public void start() throws InterruptedException
 
     statusFuture = Futures.transform(
         taskRunner.run(task),
-        new Function<TaskStatus, TaskStatus>()
+        new Function<>()
         {
           @Override
           public TaskStatus apply(TaskStatus taskStatus)
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/FilteringCloseableInputRowIteratorTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/FilteringCloseableInputRowIteratorTest.java
index a0b1c101d40c..2b4ffe26f31b 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/FilteringCloseableInputRowIteratorTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/FilteringCloseableInputRowIteratorTest.java
@@ -95,7 +95,7 @@ public void testFilterOutRows()
   public void testParseExceptionInDelegateNext()
   {
     // This iterator throws ParseException every other call to next().
-    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<InputRow>()
+    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<>()
     {
       final int numRowsToIterate = ROWS.size() * 2;
       int nextIdx = 0;
@@ -144,7 +144,7 @@ public void testParseExceptionInPredicateTest()
         ROWS.iterator()
     );
     // This filter throws ParseException every other call to test().
-    final Predicate<InputRow> filter = new Predicate<InputRow>()
+    final Predicate<InputRow> filter = new Predicate<>()
     {
       boolean throwParseException = false;
 
@@ -183,7 +183,7 @@ public boolean test(InputRow inputRow)
   public void testParseExceptionInDelegateHasNext()
   {
     // This iterator throws ParseException every other call to hasNext().
-    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<InputRow>()
+    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<>()
     {
       final int numRowsToIterate = ROWS.size() * 2;
       int currentIndex = 0;
@@ -229,7 +229,7 @@ public void close()
   public void testNonParseExceptionInDelegateHasNext()
   {
     // This iterator throws ParseException every other call to hasNext().
-    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<InputRow>()
+    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<>()
     {
       final int numRowsToIterate = ROWS.size() * 2;
       int currentIndex = 0;
@@ -294,7 +294,7 @@ public void testParseExceptionSaveExceptionCause()
   {
 
     // This iterator throws ParseException every other call to hasNext().
-    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<InputRow>()
+    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<>()
     {
       final int numRowsToIterate = ROWS.size() * 2;
       int currentIndex = 0;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
index 7fbd6317d82f..d1e54665f2d7 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
@@ -2551,9 +2551,7 @@ private IngestionStatsAndErrors getTaskReportData() throws IOException
   {
     TaskReport.ReportMap taskReports = jsonMapper.readValue(
         taskRunner.getTaskReportsFile(),
-        new TypeReference<TaskReport.ReportMap>()
-        {
-        }
+        new TypeReference<>() {}
     );
     return IngestionStatsAndErrors.getPayloadFromTaskReports(taskReports);
   }
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunnerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunnerTest.java
index ade1692ca1c4..5e0b09103c76 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunnerTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunnerTest.java
@@ -142,7 +142,7 @@ private static class TestPhaseRunner extends ParallelIndexPhaseRunner<ReportingN
     @Override
     Iterator<SubTaskSpec<ReportingNoopTask>> subTaskSpecIterator()
     {
-      return new Iterator<SubTaskSpec<ReportingNoopTask>>()
+      return new Iterator<>()
       {
         int subTaskCount = 0;
 
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java
index a1821318ba56..dab24fbb3a03 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java
@@ -63,7 +63,7 @@ static InputRow createInputRow(DateTime timestamp, List<String> dimensionValues)
 
   static CloseableIterator<InputRow> createInputRowIterator(InputRow inputRow)
   {
-    return new CloseableIterator<InputRow>()
+    return new CloseableIterator<>()
     {
       @Override
       public void close()
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java
index 5dcc11c9f1c5..0875cdde8677 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java
@@ -646,7 +646,7 @@ public void testMakeCloseableIteratorFromSequenceAndSegmentFileCloseYielderOnClo
     MutableBoolean isSequenceClosed = new MutableBoolean(false);
     MutableBoolean isFileClosed = new MutableBoolean(false);
     Sequence<Map<String, Object>> sequence = new BaseSequence<>(
-        new IteratorMaker<Map<String, Object>, Iterator<Map<String, Object>>>()
+        new IteratorMaker<>()
         {
           @Override
           public Iterator<Map<String, Object>> make()
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/OverlordBlinkLeadershipTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/OverlordBlinkLeadershipTest.java
index 3824cc20f85e..af3b81977998 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/OverlordBlinkLeadershipTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/OverlordBlinkLeadershipTest.java
@@ -36,7 +36,7 @@ public class OverlordBlinkLeadershipTest
   private RemoteTaskRunnerTestUtils rtrUtils;
   private final TestRemoteTaskRunnerConfig remoteTaskRunnerConfig = new TestRemoteTaskRunnerConfig(new Period("PT5M"));
   private final DefaultWorkerBehaviorConfig defaultWorkerBehaviourConfig = DefaultWorkerBehaviorConfig.defaultConfig();
-  private final Supplier<WorkerBehaviorConfig> workerBehaviorConfigSupplier = new Supplier<WorkerBehaviorConfig>()
+  private final Supplier<WorkerBehaviorConfig> workerBehaviorConfigSupplier = new Supplier<>()
   {
     @Override
     public DefaultWorkerBehaviorConfig get()
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTest.java
index 2ab63cd79ee5..8207584f2136 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTest.java
@@ -454,7 +454,7 @@ public void testBootstrap() throws Exception
     final Set<String> runningTasks = Sets.newHashSet(
         Iterables.transform(
             remoteTaskRunner.getRunningTasks(),
-            new Function<RemoteTaskRunnerWorkItem, String>()
+            new Function<>()
             {
               @Override
               public String apply(RemoteTaskRunnerWorkItem input)
@@ -721,7 +721,7 @@ public void testFindLazyWorkerTaskRunning() throws Exception
     Assert.assertTrue(taskAnnounced(task.getId()));
     mockWorkerRunningTask(task);
     Collection<Worker> lazyworkers = remoteTaskRunner.markWorkersLazy(
-        new Predicate<ImmutableWorkerInfo>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableWorkerInfo input)
@@ -742,7 +742,7 @@ public void testFindLazyWorkerForWorkerJustAssignedTask() throws Exception
     remoteTaskRunner.run(task);
     Assert.assertTrue(taskAnnounced(task.getId()));
     Collection<Worker> lazyworkers = remoteTaskRunner.markWorkersLazy(
-        new Predicate<ImmutableWorkerInfo>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableWorkerInfo input)
@@ -761,7 +761,7 @@ public void testFindLazyWorkerNotRunningAnyTask() throws Exception
   {
     doSetup();
     Collection<Worker> lazyworkers = remoteTaskRunner.markWorkersLazy(
-        new Predicate<ImmutableWorkerInfo>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableWorkerInfo input)
@@ -782,7 +782,7 @@ public void testFindLazyWorkerNotRunningAnyTaskButWithZeroMaxWorkers() throws Ex
   {
     doSetup();
     Collection<Worker> lazyworkers = remoteTaskRunner.markWorkersLazy(
-        new Predicate<ImmutableWorkerInfo>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableWorkerInfo input)
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
index abab38bf0c9b..eb1b8e891ecf 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
@@ -201,7 +201,7 @@ public TaskLifecycleTest(String taskStorageType)
   @Rule
   public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-  private static final Ordering<DataSegment> BY_INTERVAL_ORDERING = new Ordering<DataSegment>()
+  private static final Ordering<DataSegment> BY_INTERVAL_ORDERING = new Ordering<>()
   {
     @Override
     public int compare(DataSegment dataSegment, DataSegment dataSegment2)
@@ -287,7 +287,7 @@ protected InputSourceReader fixedFormatReader(InputRowSchema inputRowSchema, @Nu
         @Override
         public CloseableIterator<InputRow> read(InputStats inputStats)
         {
-          return new CloseableIterator<InputRow>()
+          return new CloseableIterator<>()
           {
             @Override
             public void close()
@@ -777,7 +777,7 @@ public void testKillUnusedSegmentsTask() throws Exception
             "2011-04-01/2011-04-02",
             "2011-04-02/2011-04-03",
             "2011-04-04/2011-04-05"
-        ), new Function<String, DataSegment>()
+        ), new Function<>()
         {
           @Override
           public DataSegment apply(String input)
@@ -874,7 +874,7 @@ public void testKillUnusedSegmentsTaskWithMaxSegmentsToKill() throws Exception
             "2011-04-01/2011-04-02",
             "2011-04-02/2011-04-03",
             "2011-04-04/2011-04-05"
-        ), new Function<String, DataSegment>()
+        ), new Function<>()
         {
           @Override
           public DataSegment apply(String input)
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskRunner.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskRunner.java
index 2b97b170be36..2afb2b4dae31 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskRunner.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskRunner.java
@@ -219,7 +219,7 @@ public ListenableFuture<TaskStatus> run(final Task task)
     runningItems.add(taskRunnerWorkItem);
     Futures.addCallback(
         statusFuture,
-        new FutureCallback<TaskStatus>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(TaskStatus result)
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java
index 249f510d818c..8a1232b95714 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java
@@ -101,7 +101,7 @@ public void setUp()
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -127,7 +127,7 @@ public void testGetExpectedWorkerCapacityWithNoWorkerAndHintIsValid()
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -155,7 +155,7 @@ public void testGetExpectedWorkerCapacityWithNoWorkerAndHintIsNotValid()
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -278,7 +278,7 @@ public void testProvisionNoCurrentlyRunningWorkerWithCapacityHintSetAndNoPending
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -329,7 +329,7 @@ public void testProvisionNoCurrentlyRunningWorkerWithCapacityHintSetAndNoPending
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -493,7 +493,7 @@ public void testProvisionWithPendingTaskAndWorkerCapacityHintSetButNonEmptyCurre
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -568,7 +568,7 @@ public void testProvisionWithPendingTaskAndWorkerCapacityHintSetButEmptyCurrentl
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java
index 7f9739ad55ff..0799b3ba6e43 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java
@@ -93,7 +93,7 @@ public void setUp()
         simpleWorkerProvisioningConfig,
         DSuppliers.of(workerConfig),
         schedulerConfig,
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java
index 732d586002f8..2837f63e0590 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java
@@ -1076,9 +1076,7 @@ public void testGetLockedIntervals() throws Exception
     final ObjectMapper jsonMapper = TestHelper.makeJsonMapper();
     Map<String, List<Interval>> observedIntervals = jsonMapper.readValue(
         jsonMapper.writeValueAsString(response.getEntity()),
-        new TypeReference<Map<String, List<Interval>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(expectedIntervals, observedIntervals);
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java
index f1a8b65a509f..8c5e9e924cc0 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java
@@ -215,7 +215,7 @@ public void setUp() throws Exception
     taskCompletionCountDownLatches.put(badTaskId, new CountDownLatch(1));
     taskCompletionCountDownLatches.put(goodTaskId, new CountDownLatch(1));
 
-    TaskRunnerFactory<MockTaskRunner> taskRunnerFactory = new TaskRunnerFactory<MockTaskRunner>()
+    TaskRunnerFactory<MockTaskRunner> taskRunnerFactory = new TaskRunnerFactory<>()
     {
       private MockTaskRunner runner;
 
@@ -440,7 +440,7 @@ public synchronized ListenableFuture<TaskStatus> run(final Task task)
               "noop_test_task_exec_%s"
           )
       ).submit(
-          new Callable<TaskStatus>()
+          new Callable<>()
           {
             @Override
             public TaskStatus call() throws Exception
@@ -499,7 +499,7 @@ public synchronized Collection<? extends TaskRunnerWorkItem> getRunningTasks()
     {
       return Lists.transform(
           runningTasks,
-          new Function<String, TaskRunnerWorkItem>()
+          new Function<>()
           {
             @Nullable
             @Override
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamEndSequenceNumbersTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamEndSequenceNumbersTest.java
index 9cf29d6cbd25..6f0f5d3b51eb 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamEndSequenceNumbersTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamEndSequenceNumbersTest.java
@@ -50,7 +50,7 @@ public void testSerde() throws Exception
     // Check round-trip.
     final SeekableStreamEndSequenceNumbers<Integer, Long> partitions2 = OBJECT_MAPPER.readValue(
         serializedString,
-        new TypeReference<SeekableStreamEndSequenceNumbers<Integer, Long>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals("Round trip", partitions, partitions2);
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamStartSequenceNumbersTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamStartSequenceNumbersTest.java
index f632cf61ecf2..9f93648e3821 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamStartSequenceNumbersTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamStartSequenceNumbersTest.java
@@ -51,7 +51,7 @@ public void testSerde() throws Exception
     // Check round-trip.
     final SeekableStreamStartSequenceNumbers<Integer, Long> partitions2 = OBJECT_MAPPER.readValue(
         serializedString,
-        new TypeReference<SeekableStreamStartSequenceNumbers<Integer, Long>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals("Round trip", partitions, partitions2);
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java
index 5f5aeb0ca853..425b38045970 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java
@@ -188,7 +188,7 @@ protected SeekableStreamIndexTaskIOConfig createTaskIoConfig(
         SeekableStreamSupervisorIOConfig ioConfig
     )
     {
-      return new SeekableStreamIndexTaskIOConfig<String, String>(
+      return new SeekableStreamIndexTaskIOConfig<>(
           groupId,
           baseSequenceName,
           new SeekableStreamStartSequenceNumbers<>(STREAM, startPartitions, exclusiveStartSequenceNumberPartitions),
@@ -247,7 +247,7 @@ protected SeekableStreamDataSourceMetadata<String, String> createDataSourceMetaD
     @Override
     protected OrderedSequenceNumber<String> makeSequenceNumber(String seq, boolean isExclusive)
     {
-      return new OrderedSequenceNumber<String>(seq, isExclusive)
+      return new OrderedSequenceNumber<>(seq, isExclusive)
       {
         @Override
         public int compareTo(OrderedSequenceNumber<String> o)
@@ -281,7 +281,7 @@ protected SeekableStreamSupervisorReportPayload<String, String> createReportPayl
         boolean includeOffsets
     )
     {
-      return new SeekableStreamSupervisorReportPayload<String, String>(
+      return new SeekableStreamSupervisorReportPayload<>(
           DATASOURCE,
           STREAM,
           1,
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SequenceMetadataTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SequenceMetadataTest.java
index cae9ec1e686f..d65a21ddf942 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SequenceMetadataTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SequenceMetadataTest.java
@@ -164,7 +164,7 @@ public void testCanHandle()
 
   private OrderedSequenceNumber<String> makeSequenceNumber(String seq, boolean isExclusive)
   {
-    return new OrderedSequenceNumber<String>(seq, isExclusive)
+    return new OrderedSequenceNumber<>(seq, isExclusive)
     {
       @Override
       public int compareTo(OrderedSequenceNumber<String> o)
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateManagerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateManagerTest.java
index 4d4eaccb60c5..6ffe9dcdfc5d 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateManagerTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateManagerTest.java
@@ -372,9 +372,7 @@ public void testExceptionEventSerde() throws IOException
 
     String serialized = defaultMapper.writeValueAsString(event);
 
-    Map<String, String> deserialized = defaultMapper.readValue(serialized, new TypeReference<Map<String, String>>()
-    {
-    });
+    Map<String, String> deserialized = defaultMapper.readValue(serialized, new TypeReference<>() {});
     Assert.assertNotNull(deserialized.get("timestamp"));
     Assert.assertEquals("java.lang.NullPointerException", deserialized.get("exceptionClass"));
     Assert.assertFalse(Boolean.getBoolean(deserialized.get("streamException")));
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
index f182ced69fbb..e5b26c337066 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
@@ -2836,7 +2836,7 @@ protected SeekableStreamIndexTaskIOConfig createTaskIoConfig(
         SeekableStreamSupervisorIOConfig ioConfig
     )
     {
-      return new SeekableStreamIndexTaskIOConfig<String, String>(
+      return new SeekableStreamIndexTaskIOConfig<>(
           groupId,
           baseSequenceName,
           new SeekableStreamStartSequenceNumbers<>(STREAM, startPartitions, exclusiveStartSequenceNumberPartitions),
@@ -2908,7 +2908,7 @@ protected SeekableStreamDataSourceMetadata<String, String> createDataSourceMetaD
     @Override
     protected OrderedSequenceNumber<String> makeSequenceNumber(String seq, boolean isExclusive)
     {
-      return new OrderedSequenceNumber<String>(seq, isExclusive)
+      return new OrderedSequenceNumber<>(seq, isExclusive)
       {
         @Override
         public int compareTo(OrderedSequenceNumber<String> o)
@@ -2942,7 +2942,7 @@ protected SeekableStreamSupervisorReportPayload<String, String> createReportPayl
         boolean includeOffsets
     )
     {
-      return new SeekableStreamSupervisorReportPayload<String, String>(
+      return new SeekableStreamSupervisorReportPayload<>(
           DATASOURCE,
           STREAM,
           1,
@@ -3196,7 +3196,7 @@ private static SeekableStreamIndexTaskIOConfig createTaskIoConfigExt(
           SeekableStreamSupervisorIOConfig ioConfig
   )
   {
-    return new SeekableStreamIndexTaskIOConfig<String, String>(
+    return new SeekableStreamIndexTaskIOConfig<>(
             groupId,
             baseSequenceName,
             new SeekableStreamStartSequenceNumbers<>(STREAM, startPartitions, exclusiveStartSequenceNumberPartitions),
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleModuleTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleModuleTest.java
index fec860ab502d..8d9280111e31 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleModuleTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleModuleTest.java
@@ -53,7 +53,7 @@ public void testGetShuffleMetricsWhenShuffleMonitorExists()
            .thenReturn(Optional.of(shuffleMonitor));
     final Injector injector = createInjector(monitorScheduler);
     final Optional<ShuffleMetrics> optional = injector.getInstance(
-        Key.get(new TypeLiteral<Optional<ShuffleMetrics>>() {})
+        Key.get(new TypeLiteral<>() {})
     );
     Assert.assertTrue(optional.isPresent());
   }
@@ -66,7 +66,7 @@ public void testGetShuffleMetricsWithNoShuffleMonitor()
            .thenReturn(Optional.empty());
     final Injector injector = createInjector(monitorScheduler);
     final Optional<ShuffleMetrics> optional = injector.getInstance(
-        Key.get(new TypeLiteral<Optional<ShuffleMetrics>>() {})
+        Key.get(new TypeLiteral<>() {})
     );
     Assert.assertFalse(optional.isPresent());
   }
diff --git a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/cluster/CatalogClient.java b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/cluster/CatalogClient.java
index eee5b3d79730..03d79fef49d7 100644
--- a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/cluster/CatalogClient.java
+++ b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/cluster/CatalogClient.java
@@ -131,7 +131,7 @@ public List<String> listSchemas()
         clusterClient.leadCoordinatorUrl(),
         CatalogResource.ROOT_PATH
     );
-    return clusterClient.getAs(url, new TypeReference<List<String>>() { });
+    return clusterClient.getAs(url, new TypeReference<>() {});
   }
 
   public List<TableId> listTables()
@@ -141,7 +141,7 @@ public List<TableId> listTables()
         clusterClient.leadCoordinatorUrl(),
         CatalogResource.ROOT_PATH
     );
-    return clusterClient.getAs(url, new TypeReference<List<TableId>>() { });
+    return clusterClient.getAs(url, new TypeReference<>() {});
   }
 
   public List<String> listTableNamesInSchema(String schemaName)
@@ -152,7 +152,7 @@ public List<String> listTableNamesInSchema(String schemaName)
         CatalogResource.ROOT_PATH,
         schemaName
     );
-    return clusterClient.getAs(url, new TypeReference<List<String>>() { });
+    return clusterClient.getAs(url, new TypeReference<>() {});
   }
 
   public List<TableMetadata> listTablesInSchema(String schemaName)
@@ -163,6 +163,6 @@ public List<TableMetadata> listTablesInSchema(String schemaName)
         CatalogResource.ROOT_PATH,
         schemaName
     );
-    return clusterClient.getAs(url, new TypeReference<List<TableMetadata>>() { });
+    return clusterClient.getAs(url, new TypeReference<>() {});
   }
 }
diff --git a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/ServerManagerForQueryErrorTest.java b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/ServerManagerForQueryErrorTest.java
index d5b82e9c8d58..91434232b92c 100644
--- a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/ServerManagerForQueryErrorTest.java
+++ b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/ServerManagerForQueryErrorTest.java
@@ -147,7 +147,7 @@ protected <T> QueryRunner<T> buildQueryRunnerForSegment(
         return new ReportTimelineMissingSegmentQueryRunner<>(descriptor);
       }
     } else if (queryContext.getBoolean(QUERY_TIMEOUT_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -162,7 +162,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_CAPACITY_EXCEEDED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -177,7 +177,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_UNSUPPORTED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -192,7 +192,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(RESOURCE_LIMIT_EXCEEDED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -207,7 +207,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_FAILURE_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
diff --git a/integration-tests/src/main/java/org/apache/druid/server/coordination/ServerManagerForQueryErrorTest.java b/integration-tests/src/main/java/org/apache/druid/server/coordination/ServerManagerForQueryErrorTest.java
index 8bfceb544708..6e225304a4a3 100644
--- a/integration-tests/src/main/java/org/apache/druid/server/coordination/ServerManagerForQueryErrorTest.java
+++ b/integration-tests/src/main/java/org/apache/druid/server/coordination/ServerManagerForQueryErrorTest.java
@@ -145,7 +145,7 @@ protected <T> QueryRunner<T> buildQueryRunnerForSegment(
         return new ReportTimelineMissingSegmentQueryRunner<>(descriptor);
       }
     } else if (queryContext.getBoolean(QUERY_TIMEOUT_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -160,7 +160,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_CAPACITY_EXCEEDED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -175,7 +175,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_UNSUPPORTED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -190,7 +190,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(RESOURCE_LIMIT_EXCEEDED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -205,7 +205,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_FAILURE_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java
index c558ff91ca3d..18a8affeac7a 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java
@@ -99,9 +99,7 @@ public byte[] encode(Object content) throws IOException
     @Override
     public List<Map<String, Object>> decode(byte[] content) throws IOException
     {
-      return om.readValue(content, new TypeReference<List<Map<String, Object>>>()
-      {
-      });
+      return om.readValue(content, new TypeReference<>() {});
     }
   }
 
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java
index 09dfff04c605..0a54ee6e581f 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java
@@ -89,9 +89,7 @@ public List<String> getDimensions(String dataSource, String interval)
         );
       }
       return jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<String>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/CompactionResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/CompactionResourceTestClient.java
index 74d56065ef45..849af4975673 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/CompactionResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/CompactionResourceTestClient.java
@@ -113,7 +113,7 @@ public DruidCompactionConfig getCompactionConfig() throws Exception
           response.getContent()
       );
     }
-    return jsonMapper.readValue(response.getContent(), new TypeReference<DruidCompactionConfig>() {});
+    return jsonMapper.readValue(response.getContent(), new TypeReference<>() {});
   }
 
   public DataSourceCompactionConfig getDataSourceCompactionConfig(String dataSource) throws Exception
@@ -129,7 +129,7 @@ public DataSourceCompactionConfig getDataSourceCompactionConfig(String dataSourc
           response.getContent()
       );
     }
-    return jsonMapper.readValue(response.getContent(), new TypeReference<DataSourceCompactionConfig>() {});
+    return jsonMapper.readValue(response.getContent(), new TypeReference<>() {});
   }
 
   public void forceTriggerAutoCompaction() throws Exception
@@ -183,7 +183,7 @@ public Map<String, String> getCompactionProgress(String dataSource) throws Excep
           response.getContent()
       );
     }
-    return jsonMapper.readValue(response.getContent(), new TypeReference<Map<String, String>>() {});
+    return jsonMapper.readValue(response.getContent(), new TypeReference<>() {});
   }
 
   public Map<String, String> getCompactionStatus(String dataSource) throws Exception
@@ -201,7 +201,7 @@ public Map<String, String> getCompactionStatus(String dataSource) throws Excepti
           response.getContent()
       );
     }
-    Map<String, List<Map<String, String>>> latestSnapshots = jsonMapper.readValue(response.getContent(), new TypeReference<Map<String, List<Map<String, String>>>>() {});
+    Map<String, List<Map<String, String>>> latestSnapshots = jsonMapper.readValue(response.getContent(), new TypeReference<>() {});
     return latestSnapshots.get("latestStatus").get(0);
   }
 }
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java
index 7a42119e6cca..e82580cd312e 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java
@@ -131,9 +131,7 @@ public List<String> getSegments(final String dataSource)
       );
 
       segments = jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<String>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -152,9 +150,7 @@ public List<DataSegment> getFullSegmentsMetadata(final String dataSource)
       );
 
       segments = jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<DataSegment>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -171,9 +167,7 @@ public List<String> getSegmentIntervals(final String dataSource)
       StatusResponseHolder response = makeRequest(HttpMethod.GET, getIntervalsURL(dataSource));
 
       segments = jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<String>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -189,9 +183,7 @@ public List<DataSegment> getAvailableSegments(final String dataSource)
       StatusResponseHolder response = makeRequest(HttpMethod.GET, getFullSegmentsURL(dataSource));
 
       return jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<DataSegment>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -222,9 +214,7 @@ private Map<String, Integer> getLoadStatus(String dataSource)
       }
 
       status = jsonMapper.readValue(
-          response.getContent(), new TypeReference<Map<String, Integer>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -333,9 +323,7 @@ public Map<String, Object> initializeLookups(String filePath) throws Exception
 
     Map<String, Object> results2 = jsonMapper.readValue(
         response.getContent(),
-        new TypeReference<Map<String, Object>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     return results2;
@@ -367,9 +355,7 @@ private Map<String, Map<HostAndPort, LookupsState<LookupExtractorFactoryMapConta
 
       status = jsonMapper.readValue(
           response.getContent(),
-          new TypeReference<Map<String, Map<HostAndPort, LookupsState<LookupExtractorFactoryMapContainer>>>>()
-          {
-          }
+          new TypeReference<>() {}
       );
     }
     catch (Exception e) {
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java
index f75dc6043f9d..9b6c3ec1ef74 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java
@@ -147,9 +147,7 @@ public TaskStatusPlus getTaskStatus(String taskID)
       LOG.debug("Index status response" + response.getContent());
       TaskStatusResponse taskStatusResponse = jsonMapper.readValue(
           response.getContent(),
-          new TypeReference<TaskStatusResponse>()
-          {
-          }
+          new TypeReference<>() {}
       );
       return taskStatusResponse.getStatus();
     }
@@ -236,9 +234,7 @@ private List<TaskResponseObject> getTasks(String identifier)
         LOG.debug("Tasks %s response %s", identifier, response.getContent());
       }
       return jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<TaskResponseObject>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -257,9 +253,7 @@ public TaskPayloadResponse getTaskPayload(String taskId)
         LOG.debug("Task %s response %s", taskId, response.getContent());
       }
       return jsonMapper.readValue(
-          response.getContent(), new TypeReference<TaskPayloadResponse>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (ISE e) {
@@ -350,9 +344,7 @@ public Map<String, List<Interval>> getLockedIntervals(List<LockFilterPolicy> loc
       ).get();
       return jsonMapper.readValue(
           response.getContent(),
-          new TypeReference<Map<String, List<Interval>>>()
-          {
-          }
+          new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -368,7 +360,7 @@ public void waitUntilTaskCompletes(final String taskID)
   public void waitUntilTaskCompletes(final String taskID, final long millisEach, final int numTimes)
   {
     ITRetryUtil.retryUntil(
-        new Callable<Boolean>()
+        new Callable<>()
         {
           @Override
           public Boolean call()
@@ -398,7 +390,7 @@ public void waitUntilTaskFails(final String taskID)
   public void waitUntilTaskFails(final String taskID, final long millisEach, final int numTimes)
   {
     ITRetryUtil.retryUntil(
-        new Callable<Boolean>()
+        new Callable<>()
         {
           @Override
           public Boolean call()
@@ -758,9 +750,7 @@ public List<Object> getSupervisorHistory(String id)
         );
       }
       List<Object> responseData = jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<Object>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
       return responseData;
     }
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java
index f680ad909a63..673db41e7f74 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java
@@ -117,9 +117,7 @@ public void testQueriesFromFile(String url, String filePath) throws Exception
     List<QueryResultType> queries =
         jsonMapper.readValue(
             TestQueryHelper.class.getResourceAsStream(filePath),
-            new TypeReference<List<QueryResultType>>()
-            {
-            }
+            new TypeReference<>() {}
         );
 
     testQueries(url, queries);
@@ -131,9 +129,7 @@ public void testQueriesFromString(String url, String str) throws Exception
     List<QueryResultType> queries =
         jsonMapper.readValue(
             str,
-            new TypeReference<List<QueryResultType>>()
-            {
-            }
+            new TypeReference<>() {}
         );
     testQueries(url, queries);
   }
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java
index c4a70a475e5d..0b544244509a 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java
@@ -269,9 +269,7 @@ public void testQueriesFromFile(String filePath, String fullDatasourcePath) thro
     List<MsqQueryWithResults> queries =
         jsonMapper.readValue(
             TestQueryHelper.class.getResourceAsStream(filePath),
-            new TypeReference<List<MsqQueryWithResults>>()
-            {
-            }
+            new TypeReference<>() {}
         );
     for (MsqQueryWithResults queryWithResults : queries) {
       String queryString = queryWithResults.getQuery();
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/ServerDiscoveryUtil.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/ServerDiscoveryUtil.java
index 56b475f102fa..cfaa7080b21b 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/ServerDiscoveryUtil.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/ServerDiscoveryUtil.java
@@ -50,7 +50,7 @@ public static boolean isInstanceReady(ServerDiscoverySelector serviceProvider)
   public static void waitUntilInstanceReady(final ServerDiscoverySelector serviceProvider, String instanceType)
   {
     ITRetryUtil.retryUntilTrue(
-        new Callable<Boolean>()
+        new Callable<>()
         {
           @Override
           public Boolean call()
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java b/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java
index 7895423268a9..8218328c9221 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java
@@ -149,7 +149,7 @@ public void testAutoCompactionRowWithMetricAndRowWithoutMetricShouldPreserveExis
       intervalsBeforeCompaction.sort(null);
       // 2 segments across 1 days...
       verifySegmentsCount(2);
-      ArrayList<Object> nullList = new ArrayList<Object>();
+      ArrayList<Object> nullList = new ArrayList<>();
       nullList.add(null);
       Map<String, Object> queryAndResultFields = ImmutableMap.of(
           "%%FIELD_TO_QUERY%%", "added",
@@ -245,7 +245,7 @@ public void testAutoCompactionRowWithMetricAndRowWithoutMetricShouldPreserveExis
       intervalsBeforeCompaction.sort(null);
       // 2 segments across 1 days...
       verifySegmentsCount(2);
-      ArrayList<Object> nullList = new ArrayList<Object>();
+      ArrayList<Object> nullList = new ArrayList<>();
       nullList.add(null);
       Map<String, Object> queryAndResultFields = ImmutableMap.of(
           "%%FIELD_TO_QUERY%%", "added",
@@ -348,7 +348,7 @@ public void testAutoCompactionOnlyRowsWithoutMetricShouldAddNewMetrics() throws
       intervalsBeforeCompaction.sort(null);
       // 2 segments across 1 days...
       verifySegmentsCount(2);
-      ArrayList<Object> nullList = new ArrayList<Object>();
+      ArrayList<Object> nullList = new ArrayList<>();
       nullList.add(null);
       Map<String, Object> queryAndResultFields = ImmutableMap.of(
           "%%FIELD_TO_QUERY%%", "added",
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/query/ITQueryRetryTestOnMissingSegments.java b/integration-tests/src/test/java/org/apache/druid/tests/query/ITQueryRetryTestOnMissingSegments.java
index 999ebc8c6804..f05e5c42e6e8 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/query/ITQueryRetryTestOnMissingSegments.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/query/ITQueryRetryTestOnMissingSegments.java
@@ -132,9 +132,7 @@ private void testQueries(String queryWithResultsStr, Expectation expectation) th
   {
     final List<QueryWithResults> queries = jsonMapper.readValue(
         queryWithResultsStr,
-        new TypeReference<List<QueryWithResults>>()
-        {
-        }
+        new TypeReference<>() {}
     );
     testQueries(queries, expectation);
   }
@@ -156,9 +154,7 @@ private void testQueries(List<QueryWithResults> queries, Expectation expectation
 
         List<Map<String, Object>> result = jsonMapper.readValue(
             responseHolder.getContent(),
-            new TypeReference<List<Map<String, Object>>>()
-            {
-            }
+            new TypeReference<>() {}
         );
         if (!QueryResultVerifier.compareResults(
             result,
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/security/AbstractAuthConfigurationTest.java b/integration-tests/src/test/java/org/apache/druid/tests/security/AbstractAuthConfigurationTest.java
index 1c5867916137..b2ecc596e7c6 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/security/AbstractAuthConfigurationTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/security/AbstractAuthConfigurationTest.java
@@ -94,9 +94,7 @@ public abstract class AbstractAuthConfigurationTest
       "SELECT * FROM sys.tasks WHERE datasource IN ('auth_test')";
 
   protected static final TypeReference<List<Map<String, Object>>> SYS_SCHEMA_RESULTS_TYPE_REFERENCE =
-      new TypeReference<List<Map<String, Object>>>()
-      {
-      };
+      new TypeReference<>() {};
 
   /**
    * create a ResourceAction set of permissions that can only read a 'auth_test' datasource, for Authorizer
diff --git a/processing/src/main/java/org/apache/druid/collections/CircularList.java b/processing/src/main/java/org/apache/druid/collections/CircularList.java
index 7cf551d6cf88..3eb08bc2cf17 100644
--- a/processing/src/main/java/org/apache/druid/collections/CircularList.java
+++ b/processing/src/main/java/org/apache/druid/collections/CircularList.java
@@ -51,7 +51,7 @@ public CircularList(final Set<T> elements, final Comparator<? super T> comparato
   @Override
   public Iterator<T> iterator()
   {
-    return new Iterator<T>()
+    return new Iterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java b/processing/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
index 6d731923c556..215ebda95aa7 100644
--- a/processing/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
+++ b/processing/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
@@ -97,7 +97,7 @@ public ResourceHolder<T> increment()
     }
 
     // This ResourceHolder is supposed to be used from a single thread, so no synchronization/atomicity
-    return new ResourceHolder<T>()
+    return new ResourceHolder<>()
     {
       boolean released = false;
 
diff --git a/processing/src/main/java/org/apache/druid/collections/StableLimitingSorter.java b/processing/src/main/java/org/apache/druid/collections/StableLimitingSorter.java
index 76208bc05f9d..d0c53781ca7c 100644
--- a/processing/src/main/java/org/apache/druid/collections/StableLimitingSorter.java
+++ b/processing/src/main/java/org/apache/druid/collections/StableLimitingSorter.java
@@ -80,7 +80,7 @@ public int size()
    */
   public Iterator<T> drain()
   {
-    return new Iterator<T>()
+    return new Iterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/collections/bitmap/ConciseBitmapFactory.java b/processing/src/main/java/org/apache/druid/collections/bitmap/ConciseBitmapFactory.java
index a6cbb568cdee..6e1a4ddca5ca 100644
--- a/processing/src/main/java/org/apache/druid/collections/bitmap/ConciseBitmapFactory.java
+++ b/processing/src/main/java/org/apache/druid/collections/bitmap/ConciseBitmapFactory.java
@@ -41,13 +41,13 @@ private static Iterable<ImmutableConciseSet> unwrap(
       final Iterable<ImmutableBitmap> b
   )
   {
-    return new Iterable<ImmutableConciseSet>()
+    return new Iterable<>()
     {
       @Override
       public Iterator<ImmutableConciseSet> iterator()
       {
         final Iterator<ImmutableBitmap> i = b.iterator();
-        return new Iterator<ImmutableConciseSet>()
+        return new Iterator<>()
         {
           @Override
           public void remove()
diff --git a/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java b/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java
index a62c74cf2914..c62264fc343f 100644
--- a/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java
+++ b/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java
@@ -58,13 +58,13 @@ private static Iterable<ImmutableRoaringBitmap> unwrap(
       final Iterable<ImmutableBitmap> b
   )
   {
-    return new Iterable<ImmutableRoaringBitmap>()
+    return new Iterable<>()
     {
       @Override
       public Iterator<ImmutableRoaringBitmap> iterator()
       {
         final Iterator<ImmutableBitmap> i = b.iterator();
-        return new Iterator<ImmutableRoaringBitmap>()
+        return new Iterator<>()
         {
           @Override
           public void remove()
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableFloatNode.java b/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableFloatNode.java
index 8025f83bee3d..30d596ab18ec 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableFloatNode.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableFloatNode.java
@@ -159,12 +159,12 @@ public ImmutableBitmap getImmutableBitmap()
   @SuppressWarnings("ArgumentParameterSwap")
   public Iterable<ImmutableNode<float[]>> getChildren()
   {
-    return new Iterable<ImmutableNode<float[]>>()
+    return new Iterable<>()
     {
       @Override
       public Iterator<ImmutableNode<float[]>> iterator()
       {
-        return new Iterator<ImmutableNode<float[]>>()
+        return new Iterator<>()
         {
           private int count = 0;
 
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/search/GutmanSearchStrategy.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/GutmanSearchStrategy.java
index 7070a29c66d6..2cb3df491ca5 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/search/GutmanSearchStrategy.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/GutmanSearchStrategy.java
@@ -36,7 +36,7 @@ public Iterable<ImmutableBitmap> search(ImmutableNode<TCoordinateArray> node, Bo
     if (bound.getLimit() > 0) {
       return Iterables.transform(
           breadthFirstSearch(node, bound),
-          new Function<ImmutableNode, ImmutableBitmap>()
+          new Function<>()
           {
             @Override
             public ImmutableBitmap apply(ImmutableNode immutableNode)
@@ -49,7 +49,7 @@ public ImmutableBitmap apply(ImmutableNode immutableNode)
 
     return Iterables.transform(
         depthFirstSearch(node, bound),
-        new Function<ImmutableFloatPoint, ImmutableBitmap>()
+        new Function<>()
         {
           @Override
           public ImmutableBitmap apply(ImmutableFloatPoint immutablePoint)
@@ -134,7 +134,7 @@ public Iterable<ImmutableNode> breadthFirstSearch(
         Iterables.transform(
             Iterables.filter(
                 nodes,
-                new Predicate<ImmutableNode>()
+                new Predicate<>()
                 {
                   @Override
                   public boolean apply(ImmutableNode immutableNode)
@@ -166,7 +166,7 @@ public boolean apply(ImmutableNode immutableNode)
 
     Iterable<ImmutableNode> overlappingNodes = Iterables.filter(
         nodes,
-        new Predicate<ImmutableNode>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableNode immutableNode)
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
index 68dc2174a891..1ef82732a4f2 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
@@ -165,7 +165,7 @@ public Iterable<ImmutableFloatPoint> filter(Iterable<ImmutableFloatPoint> points
   {
     return Iterables.filter(
         points,
-        new Predicate<ImmutableFloatPoint>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableFloatPoint immutablePoint)
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/search/RadiusBound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/RadiusBound.java
index 0a817ce58496..4f5ddabad258 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/search/RadiusBound.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/RadiusBound.java
@@ -140,7 +140,7 @@ public Iterable<ImmutableFloatPoint> filter(Iterable<ImmutableFloatPoint> points
   {
     return Iterables.filter(
         points,
-        new Predicate<ImmutableFloatPoint>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableFloatPoint point)
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/search/RectangularBound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/RectangularBound.java
index f2413fc5e3c7..1bc25079a03f 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/search/RectangularBound.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/RectangularBound.java
@@ -139,7 +139,7 @@ public Iterable<ImmutableFloatPoint> filter(Iterable<ImmutableFloatPoint> points
   {
     return Iterables.filter(
         points,
-        new Predicate<ImmutableFloatPoint>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableFloatPoint immutablePoint)
diff --git a/processing/src/main/java/org/apache/druid/common/config/ConfigManager.java b/processing/src/main/java/org/apache/druid/common/config/ConfigManager.java
index 7ba1481e97d2..87cbad379410 100644
--- a/processing/src/main/java/org/apache/druid/common/config/ConfigManager.java
+++ b/processing/src/main/java/org/apache/druid/common/config/ConfigManager.java
@@ -141,20 +141,20 @@ public <T> AtomicReference<T> watchConfig(final String key, final ConfigSerde<T>
               public ConfigHolder<T> call()
               {
                 if (!started) {
-                  watchedConfigs.put(key, new ConfigHolder<T>(null, serde));
+                  watchedConfigs.put(key, new ConfigHolder<>(null, serde));
                 } else {
                   try {
                     // Multiple of these callables can be submitted at the same time, but the callables themselves
                     // are executed serially, so double check that it hasn't already been populated.
                     if (!watchedConfigs.containsKey(key)) {
                       byte[] value = dbConnector.lookup(configTable, "name", "payload", key);
-                      ConfigHolder<T> holder = new ConfigHolder<T>(value, serde);
+                      ConfigHolder<T> holder = new ConfigHolder<>(value, serde);
                       watchedConfigs.put(key, holder);
                     }
                   }
                   catch (Exception e) {
                     log.warn(e, "Failed loading config for key[%s]", key);
-                    watchedConfigs.put(key, new ConfigHolder<T>(null, serde));
+                    watchedConfigs.put(key, new ConfigHolder<>(null, serde));
                   }
                 }
 
@@ -291,9 +291,9 @@ private static class ConfigHolder<T>
         ConfigSerde<T> serde
     )
     {
-      this.rawBytes = new AtomicReference<byte[]>(rawBytes);
+      this.rawBytes = new AtomicReference<>(rawBytes);
       this.serde = serde;
-      this.reference = new AtomicReference<T>(serde.deserialize(rawBytes));
+      this.reference = new AtomicReference<>(serde.deserialize(rawBytes));
     }
 
     public AtomicReference<T> getReference()
diff --git a/processing/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java b/processing/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
index 92a9ea0ebee7..aa432058f0af 100644
--- a/processing/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
+++ b/processing/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
@@ -130,7 +130,7 @@ public <T> SetResult set(
   @VisibleForTesting
   <T> ConfigSerde<T> create(final Class<? extends T> clazz, final T defaultVal)
   {
-    return new ConfigSerde<T>()
+    return new ConfigSerde<>()
     {
       @Override
       public byte[] serialize(T obj)
@@ -158,7 +158,7 @@ public T deserialize(byte[] bytes)
   @VisibleForTesting
   <T> ConfigSerde<T> create(final TypeReference<? extends T> clazz, final T defaultVal)
   {
-    return new ConfigSerde<T>()
+    return new ConfigSerde<>()
     {
       @Override
       public byte[] serialize(T obj)
diff --git a/processing/src/main/java/org/apache/druid/common/guava/CombiningSequence.java b/processing/src/main/java/org/apache/druid/common/guava/CombiningSequence.java
index de33963ff425..815db844ef8c 100644
--- a/processing/src/main/java/org/apache/druid/common/guava/CombiningSequence.java
+++ b/processing/src/main/java/org/apache/druid/common/guava/CombiningSequence.java
@@ -113,7 +113,7 @@ private <OutType> Yielder<OutType> makeYielder(
       final CombiningYieldingAccumulator<OutType, T> combiningAccumulator
   )
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       private Yielder<T> myYielder = yielder;
       private CombiningYieldingAccumulator<OutType, T> accum = combiningAccumulator;
diff --git a/processing/src/main/java/org/apache/druid/common/guava/DSuppliers.java b/processing/src/main/java/org/apache/druid/common/guava/DSuppliers.java
index 86d76b11c8c8..72398aefabbd 100644
--- a/processing/src/main/java/org/apache/druid/common/guava/DSuppliers.java
+++ b/processing/src/main/java/org/apache/druid/common/guava/DSuppliers.java
@@ -29,7 +29,7 @@ public class DSuppliers
 {
   public static <T> Supplier<T> of(final AtomicReference<T> ref)
   {
-    return new Supplier<T>()
+    return new Supplier<>()
     {
       @Override
       public T get()
diff --git a/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java b/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
index 43ab45ef4579..7f244ec7d356 100644
--- a/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
+++ b/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
@@ -173,7 +173,7 @@ public static <T> ListenableFuture<T> futureWithBaggage(final ListenableFuture<T
 
     Futures.addCallback(
         future,
-        new FutureCallback<T>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(@Nullable T result)
diff --git a/processing/src/main/java/org/apache/druid/data/input/IntermediateRowParsingReader.java b/processing/src/main/java/org/apache/druid/data/input/IntermediateRowParsingReader.java
index 6c98f823311b..912b0bdebbeb 100644
--- a/processing/src/main/java/org/apache/druid/data/input/IntermediateRowParsingReader.java
+++ b/processing/src/main/java/org/apache/druid/data/input/IntermediateRowParsingReader.java
@@ -48,7 +48,7 @@ public CloseableIterator<InputRow> read() throws IOException
   {
     final CloseableIteratorWithMetadata<T> intermediateRowIteratorWithMetadata = intermediateRowIteratorWithMetadata();
 
-    return new CloseableIterator<InputRow>()
+    return new CloseableIterator<>()
     {
       // since parseInputRows() returns a list, the below line always iterates over the list,
       // which means it calls Iterator.hasNext() and Iterator.next() at least once per row.
@@ -124,7 +124,7 @@ public CloseableIterator<InputRowListPlusRawValues> sample() throws IOException
 
     final CloseableIteratorWithMetadata<T> delegate = intermediateRowIteratorWithMetadata();
 
-    return new CloseableIterator<InputRowListPlusRawValues>()
+    return new CloseableIterator<>()
     {
       @Override
       public void close() throws IOException
diff --git a/processing/src/main/java/org/apache/druid/data/input/MaxSizeSplitHintSpec.java b/processing/src/main/java/org/apache/druid/data/input/MaxSizeSplitHintSpec.java
index 880940b820a4..4efe75e6a1f8 100644
--- a/processing/src/main/java/org/apache/druid/data/input/MaxSizeSplitHintSpec.java
+++ b/processing/src/main/java/org/apache/druid/data/input/MaxSizeSplitHintSpec.java
@@ -97,7 +97,7 @@ public int getMaxNumFiles()
   @Override
   public <T> Iterator<List<T>> split(Iterator<T> inputIterator, Function<T, InputFileAttribute> inputAttributeExtractor)
   {
-    return new Iterator<List<T>>()
+    return new Iterator<>()
     {
       private final long maxSplitSizeBytes = maxSplitSize.getBytes();
       private T peeking;
diff --git a/processing/src/main/java/org/apache/druid/data/input/TextReader.java b/processing/src/main/java/org/apache/druid/data/input/TextReader.java
index af092442fb16..0ffcb646c1e7 100644
--- a/processing/src/main/java/org/apache/druid/data/input/TextReader.java
+++ b/processing/src/main/java/org/apache/druid/data/input/TextReader.java
@@ -66,7 +66,7 @@ public CloseableIteratorWithMetadata<T> intermediateRowIteratorWithMetadata() th
       processHeaderLine(delegate.next());
     }
 
-    return new CloseableIteratorWithMetadata<T>()
+    return new CloseableIteratorWithMetadata<>()
     {
       private static final String LINE_KEY = "Line";
       private long currentLineNumber = numHeaderLines + (needsToProcessHeaderLine() ? 1 : 0);
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
index efc3718d4ff4..c13b69105ea2 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
@@ -201,7 +201,7 @@ public List<SpatialDimensionSchema> getSpatialDimensions()
 
     Iterable<SpatialDimensionSchema> transformedList = Iterables.transform(
         filteredList,
-        new Function<NewSpatialDimensionSchema, SpatialDimensionSchema>()
+        new Function<>()
         {
           @Nullable
           @Override
@@ -221,7 +221,7 @@ public List<String> getDimensionNames()
   {
     return Lists.transform(
         dimensions,
-        new Function<DimensionSchema, String>()
+        new Function<>()
         {
           @Override
           public String apply(DimensionSchema input)
@@ -295,7 +295,7 @@ private void verify(List<SpatialDimensionSchema> spatialDimensions)
 
     List<String> spatialDimNames = Lists.transform(
         spatialDimensions,
-        new Function<SpatialDimensionSchema, String>()
+        new Function<>()
         {
           @Override
           public String apply(SpatialDimensionSchema input)
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/JsonNodeReader.java b/processing/src/main/java/org/apache/druid/data/input/impl/JsonNodeReader.java
index d45a34e8b815..58564370132d 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/JsonNodeReader.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/JsonNodeReader.java
@@ -164,9 +164,7 @@ protected List<Map<String, Object>> toMap(JsonNode intermediateRow) throws IOExc
       throw ((ParseExceptionMarkerJsonNode) intermediateRow).getParseException();
     }
     return Collections.singletonList(
-        mapper.readValue(intermediateRow.toString(), new TypeReference<Map<String, Object>>()
-        {
-        })
+        mapper.readValue(intermediateRow.toString(), new TypeReference<>() {})
     );
   }
 
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
index 7d6065bfdc68..823e0920b7ff 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
@@ -45,7 +45,7 @@ public TimeAndDimsParseSpec(
   @Override
   public Parser<String, Object> makeParser()
   {
-    return new Parser<String, Object>()
+    return new Parser<>()
     {
       @Override
       public Map<String, Object> parseToMap(String input)
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/TimedShutoffInputSourceReader.java b/processing/src/main/java/org/apache/druid/data/input/impl/TimedShutoffInputSourceReader.java
index 3438abb02e29..c26f197bf3e2 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/TimedShutoffInputSourceReader.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/TimedShutoffInputSourceReader.java
@@ -72,7 +72,7 @@ private <T> CloseableIterator<T> decorateShutdownTimeout(
     final Closer closer = Closer.create();
     closer.register(delegateIterator);
     closer.register(exec::shutdownNow);
-    final CloseableIterator<T> wrappingIterator = new CloseableIterator<T>()
+    final CloseableIterator<T> wrappingIterator = new CloseableIterator<>()
     {
       /**
        * Indicates this iterator has been closed or not.
diff --git a/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java b/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
index 43591e2b59d1..b48bae6c0b2f 100755
--- a/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
+++ b/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
@@ -38,7 +38,7 @@ public class ImmutableConciseSet
 {
   private static final int CHUNK_SIZE = 10000;
 
-  private static final Comparator<WordIterator> UNION_COMPARATOR = new Comparator<WordIterator>()
+  private static final Comparator<WordIterator> UNION_COMPARATOR = new Comparator<>()
   {
     // Comparison is first by index, then one fills < literals < zero fills
     // one fills are sorted by length (longer one fills have priority)
@@ -81,7 +81,7 @@ public int compare(WordIterator i1, WordIterator i2)
     }
   };
 
-  private static final Comparator<WordIterator> INTERSECTION_COMPARATOR = new Comparator<WordIterator>()
+  private static final Comparator<WordIterator> INTERSECTION_COMPARATOR = new Comparator<>()
   {
     // Comparison is first by index, then zero fills < literals < one fills
     // zero fills are sorted by length (longer zero fills have priority)
diff --git a/processing/src/main/java/org/apache/druid/frame/allocation/ArenaMemoryAllocator.java b/processing/src/main/java/org/apache/druid/frame/allocation/ArenaMemoryAllocator.java
index ebc493335521..64865f35b9d1 100644
--- a/processing/src/main/java/org/apache/druid/frame/allocation/ArenaMemoryAllocator.java
+++ b/processing/src/main/java/org/apache/druid/frame/allocation/ArenaMemoryAllocator.java
@@ -74,7 +74,7 @@ public Optional<ResourceHolder<WritableMemory>> allocate(final long size)
       lastAllocation = memory;
 
       return Optional.of(
-          new ResourceHolder<WritableMemory>()
+          new ResourceHolder<>()
           {
             boolean closed;
 
diff --git a/processing/src/main/java/org/apache/druid/frame/allocation/HeapMemoryAllocator.java b/processing/src/main/java/org/apache/druid/frame/allocation/HeapMemoryAllocator.java
index a78c53c4a372..84ff9d6caa52 100644
--- a/processing/src/main/java/org/apache/druid/frame/allocation/HeapMemoryAllocator.java
+++ b/processing/src/main/java/org/apache/druid/frame/allocation/HeapMemoryAllocator.java
@@ -59,7 +59,7 @@ public Optional<ResourceHolder<WritableMemory>> allocate(final long size)
       bytesAllocated += size;
 
       return Optional.of(
-          new ResourceHolder<WritableMemory>()
+          new ResourceHolder<>()
           {
             private WritableMemory memory =
                 WritableMemory.writableWrap(ByteBuffer.allocate(Ints.checkedCast(size)).order(ByteOrder.LITTLE_ENDIAN));
diff --git a/processing/src/main/java/org/apache/druid/frame/channel/FrameChannelSequence.java b/processing/src/main/java/org/apache/druid/frame/channel/FrameChannelSequence.java
index 3ef3b118774f..d56e7a2aa887 100644
--- a/processing/src/main/java/org/apache/druid/frame/channel/FrameChannelSequence.java
+++ b/processing/src/main/java/org/apache/druid/frame/channel/FrameChannelSequence.java
@@ -39,7 +39,7 @@ public class FrameChannelSequence extends BaseSequence<Frame, FrameChannelSequen
   public FrameChannelSequence(final ReadableFrameChannel channel)
   {
     super(
-        new IteratorMaker<Frame, FrameChannelIterator>()
+        new IteratorMaker<>()
         {
           @Override
           public FrameChannelIterator make()
diff --git a/processing/src/main/java/org/apache/druid/frame/field/NumericArrayFieldWriter.java b/processing/src/main/java/org/apache/druid/frame/field/NumericArrayFieldWriter.java
index 8096e323dc32..52e83a201c5f 100644
--- a/processing/src/main/java/org/apache/druid/frame/field/NumericArrayFieldWriter.java
+++ b/processing/src/main/java/org/apache/druid/frame/field/NumericArrayFieldWriter.java
@@ -137,7 +137,7 @@ public long writeTo(WritableMemory memory, long position, long maxSize)
     } else {
       // Create a columnValueSelector to write the individual elements re-using the NumericFieldWriter
       AtomicInteger index = new AtomicInteger(0);
-      ColumnValueSelector<Number> columnValueSelector = new ColumnValueSelector<Number>()
+      ColumnValueSelector<Number> columnValueSelector = new ColumnValueSelector<>()
       {
         @Override
         public double getDouble()
diff --git a/processing/src/main/java/org/apache/druid/frame/file/FrameFile.java b/processing/src/main/java/org/apache/druid/frame/file/FrameFile.java
index 7d21a54d8524..358997efcdd9 100644
--- a/processing/src/main/java/org/apache/druid/frame/file/FrameFile.java
+++ b/processing/src/main/java/org/apache/druid/frame/file/FrameFile.java
@@ -259,7 +259,7 @@ static FrameFile open(
       }
 
       final ReferenceCountingCloseableObject<Closeable> referenceCounter =
-          new ReferenceCountingCloseableObject<Closeable>(fileCloser) {};
+          new ReferenceCountingCloseableObject<>(fileCloser) {};
 
       return new FrameFile(
           file,
diff --git a/processing/src/main/java/org/apache/druid/frame/processor/FrameProcessorExecutor.java b/processing/src/main/java/org/apache/druid/frame/processor/FrameProcessorExecutor.java
index 49573b39b4ec..b76263b52e90 100644
--- a/processing/src/main/java/org/apache/druid/frame/processor/FrameProcessorExecutor.java
+++ b/processing/src/main/java/org/apache/druid/frame/processor/FrameProcessorExecutor.java
@@ -278,7 +278,7 @@ private <V> void runProcessorAfterFutureResolves(final ListenableFuture<V> futur
 
         Futures.addCallback(
             cancelableFuture,
-            new FutureCallback<V>()
+            new FutureCallback<>()
             {
               @Override
               public void onSuccess(final V ignored)
diff --git a/processing/src/main/java/org/apache/druid/frame/processor/RunAllFullyWidget.java b/processing/src/main/java/org/apache/druid/frame/processor/RunAllFullyWidget.java
index 7f79a319c280..bd5bdafe66bc 100644
--- a/processing/src/main/java/org/apache/druid/frame/processor/RunAllFullyWidget.java
+++ b/processing/src/main/java/org/apache/druid/frame/processor/RunAllFullyWidget.java
@@ -276,7 +276,7 @@ public void run()
 
         Futures.addCallback(
             future,
-            new FutureCallback<T>()
+            new FutureCallback<>()
             {
               @Override
               public void onSuccess(T result)
diff --git a/processing/src/main/java/org/apache/druid/frame/processor/SuperSorter.java b/processing/src/main/java/org/apache/druid/frame/processor/SuperSorter.java
index 8de4c8e86166..f16299bb1637 100644
--- a/processing/src/main/java/org/apache/druid/frame/processor/SuperSorter.java
+++ b/processing/src/main/java/org/apache/druid/frame/processor/SuperSorter.java
@@ -789,7 +789,7 @@ private <T> void runWorker(final FrameProcessor<T> worker, final Consumer<T> out
   {
     Futures.addCallback(
         exec.runFully(processorDecorator.decorate(worker), cancellationId),
-        new FutureCallback<T>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(T result)
diff --git a/processing/src/main/java/org/apache/druid/frame/read/FrameReaderUtils.java b/processing/src/main/java/org/apache/druid/frame/read/FrameReaderUtils.java
index 15ea29bcdd60..b6f73228c874 100644
--- a/processing/src/main/java/org/apache/druid/frame/read/FrameReaderUtils.java
+++ b/processing/src/main/java/org/apache/druid/frame/read/FrameReaderUtils.java
@@ -83,7 +83,7 @@ public static Supplier<MemoryRange<Memory>> makeRowMemorySupplier(
       final ColumnValueSelector<?> memorySelector =
           columnSelectorFactory.makeColumnValueSelector(FrameColumnSelectorFactory.ROW_MEMORY_COLUMN);
 
-      return new Supplier<MemoryRange<Memory>>()
+      return new Supplier<>()
       {
         private RowSignature lastSignature = null;
         private boolean lastSignatureOk = false;
diff --git a/processing/src/main/java/org/apache/druid/frame/read/columnar/ComplexFrameColumnReader.java b/processing/src/main/java/org/apache/druid/frame/read/columnar/ComplexFrameColumnReader.java
index f22aeb8000b9..fc30d7c996f6 100644
--- a/processing/src/main/java/org/apache/druid/frame/read/columnar/ComplexFrameColumnReader.java
+++ b/processing/src/main/java/org/apache/druid/frame/read/columnar/ComplexFrameColumnReader.java
@@ -149,7 +149,7 @@ private ComplexFrameColumn(
     @Override
     public ColumnValueSelector<?> makeColumnValueSelector(final ReadableOffset offset)
     {
-      return new ObjectColumnSelector<Object>()
+      return new ObjectColumnSelector<>()
       {
         @Nullable
         @Override
diff --git a/processing/src/main/java/org/apache/druid/frame/read/columnar/NumericArrayFrameColumnReader.java b/processing/src/main/java/org/apache/druid/frame/read/columnar/NumericArrayFrameColumnReader.java
index 986baaa099d9..81f4bcfaa5a0 100644
--- a/processing/src/main/java/org/apache/druid/frame/read/columnar/NumericArrayFrameColumnReader.java
+++ b/processing/src/main/java/org/apache/druid/frame/read/columnar/NumericArrayFrameColumnReader.java
@@ -187,7 +187,7 @@ protected Comparator<Object> getComparator()
     public ColumnValueSelector<?> makeColumnValueSelector(ReadableOffset offset)
     {
       // Cache's the row's value before returning
-      return new ObjectColumnSelector<Object>()
+      return new ObjectColumnSelector<>()
       {
 
         // Cached row number
diff --git a/processing/src/main/java/org/apache/druid/frame/read/columnar/StringArrayFrameColumnReader.java b/processing/src/main/java/org/apache/druid/frame/read/columnar/StringArrayFrameColumnReader.java
index 31c56bf38e7d..34d6ae2cd65b 100644
--- a/processing/src/main/java/org/apache/druid/frame/read/columnar/StringArrayFrameColumnReader.java
+++ b/processing/src/main/java/org/apache/druid/frame/read/columnar/StringArrayFrameColumnReader.java
@@ -178,7 +178,7 @@ private StringArrayFrameColumn(
     @Override
     public ColumnValueSelector<?> makeColumnValueSelector(ReadableOffset offset)
     {
-      return new ObjectColumnSelector<Object>()
+      return new ObjectColumnSelector<>()
       {
         @Override
         public void inspectRuntimeShape(RuntimeShapeInspector inspector)
diff --git a/processing/src/main/java/org/apache/druid/frame/segment/FrameCursorUtils.java b/processing/src/main/java/org/apache/druid/frame/segment/FrameCursorUtils.java
index de970363bb4f..1071b6a4792f 100644
--- a/processing/src/main/java/org/apache/druid/frame/segment/FrameCursorUtils.java
+++ b/processing/src/main/java/org/apache/druid/frame/segment/FrameCursorUtils.java
@@ -114,7 +114,7 @@ public static Iterable<Frame> cursorToFramesIterable(
   {
     throwIfColumnsHaveUnknownType(frameWriterFactory.signature());
 
-    return () -> new Iterator<Frame>()
+    return () -> new Iterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/guice/ConditionalMultibind.java b/processing/src/main/java/org/apache/druid/guice/ConditionalMultibind.java
index d0ca652544f1..654732c9a7d8 100644
--- a/processing/src/main/java/org/apache/druid/guice/ConditionalMultibind.java
+++ b/processing/src/main/java/org/apache/druid/guice/ConditionalMultibind.java
@@ -61,7 +61,7 @@ public class ConditionalMultibind<T>
    */
   public static <T> ConditionalMultibind<T> create(Properties properties, Binder binder, Class<T> type)
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type));
+    return new ConditionalMultibind<>(properties, Multibinder.newSetBinder(binder, type));
   }
 
   /**
@@ -82,7 +82,7 @@ public static <T> ConditionalMultibind<T> create(
       Class<? extends Annotation> annotationType
   )
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type, annotationType));
+    return new ConditionalMultibind<>(properties, Multibinder.newSetBinder(binder, type, annotationType));
   }
 
   /**
@@ -97,7 +97,7 @@ public static <T> ConditionalMultibind<T> create(
    */
   public static <T> ConditionalMultibind<T> create(Properties properties, Binder binder, TypeLiteral<T> type)
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type));
+    return new ConditionalMultibind<>(properties, Multibinder.newSetBinder(binder, type));
   }
 
   /**
@@ -118,7 +118,7 @@ public static <T> ConditionalMultibind<T> create(
       Class<? extends Annotation> annotationType
   )
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type, annotationType));
+    return new ConditionalMultibind<>(properties, Multibinder.newSetBinder(binder, type, annotationType));
   }
 
 
diff --git a/processing/src/main/java/org/apache/druid/guice/ConfigProvider.java b/processing/src/main/java/org/apache/druid/guice/ConfigProvider.java
index 66cc6261c9f3..682dce0f7cb4 100644
--- a/processing/src/main/java/org/apache/druid/guice/ConfigProvider.java
+++ b/processing/src/main/java/org/apache/druid/guice/ConfigProvider.java
@@ -48,7 +48,7 @@ public static <T> Provider<T> of(Class<T> clazz)
 
   public static <T> Provider<T> of(Class<T> clazz, Map<String, String> replacements)
   {
-    return new ConfigProvider<T>(clazz, replacements);
+    return new ConfigProvider<>(clazz, replacements);
   }
 
   private final Class<T> clazz;
diff --git a/processing/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java b/processing/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java
index 79d0e54e9e0a..2082de7c55f2 100644
--- a/processing/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java
+++ b/processing/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java
@@ -42,7 +42,7 @@ public static <T> void bind(Binder binder, String key, Class<T> clazz, T default
 
   public static <T> JacksonConfigProvider<T> of(String key, Class<T> clazz, T defaultVal)
   {
-    return new JacksonConfigProvider<T>(key, clazz, null, defaultVal);
+    return new JacksonConfigProvider<>(key, clazz, null, defaultVal);
   }
 
   private final String key;
diff --git a/processing/src/main/java/org/apache/druid/guice/JsonConfigurator.java b/processing/src/main/java/org/apache/druid/guice/JsonConfigurator.java
index 8a53dbffabf0..2d7db35e2acb 100644
--- a/processing/src/main/java/org/apache/druid/guice/JsonConfigurator.java
+++ b/processing/src/main/java/org/apache/druid/guice/JsonConfigurator.java
@@ -189,7 +189,7 @@ public <T> T configurate(
       throw new ProvisionException(
           Iterables.transform(
               messages,
-              new Function<String, Message>()
+              new Function<>()
               {
                 @Override
                 public Message apply(String input)
diff --git a/processing/src/main/java/org/apache/druid/guice/LifecycleModule.java b/processing/src/main/java/org/apache/druid/guice/LifecycleModule.java
index c411526b91b8..d09e39a7db4c 100644
--- a/processing/src/main/java/org/apache/druid/guice/LifecycleModule.java
+++ b/processing/src/main/java/org/apache/druid/guice/LifecycleModule.java
@@ -138,7 +138,7 @@ public void configure(Binder binder)
   @Provides @LazySingleton
   public Lifecycle getLifecycle(final Injector injector)
   {
-    final Key<Set<KeyHolder>> keyHolderKey = Key.get(new TypeLiteral<Set<KeyHolder>>(){}, Names.named("lifecycle"));
+    final Key<Set<KeyHolder>> keyHolderKey = Key.get(new TypeLiteral<>() {}, Names.named("lifecycle"));
     final Set<KeyHolder> eagerClasses = injector.getInstance(keyHolderKey);
 
     Lifecycle lifecycle = new Lifecycle("module")
diff --git a/processing/src/main/java/org/apache/druid/guice/LifecycleScope.java b/processing/src/main/java/org/apache/druid/guice/LifecycleScope.java
index e8496c1e3ec8..775781d40bb4 100644
--- a/processing/src/main/java/org/apache/druid/guice/LifecycleScope.java
+++ b/processing/src/main/java/org/apache/druid/guice/LifecycleScope.java
@@ -57,7 +57,7 @@ public void setLifecycle(Lifecycle lifecycle)
   @Override
   public <T> Provider<T> scope(final Key<T> key, final Provider<T> unscoped)
   {
-    return new Provider<T>()
+    return new Provider<>()
     {
       private volatile T value = null;
 
diff --git a/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java b/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java
index cad8fdfd8315..daa7ea813173 100644
--- a/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java
+++ b/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java
@@ -59,7 +59,7 @@ public DruidDefaultSerializersModule()
 
     addDeserializer(
         DateTimeZone.class,
-        new JsonDeserializer<DateTimeZone>()
+        new JsonDeserializer<>()
         {
           @Override
           public DateTimeZone deserialize(JsonParser jp, DeserializationContext ctxt)
@@ -72,7 +72,7 @@ public DateTimeZone deserialize(JsonParser jp, DeserializationContext ctxt)
     );
     addSerializer(
         DateTimeZone.class,
-        new JsonSerializer<DateTimeZone>()
+        new JsonSerializer<>()
         {
           @Override
           public void serialize(
@@ -87,7 +87,7 @@ public void serialize(
     );
     addSerializer(
         Sequence.class,
-        new JsonSerializer<Sequence>()
+        new JsonSerializer<>()
         {
           @SuppressWarnings("unchecked")
           @Override
@@ -97,7 +97,7 @@ public void serialize(Sequence value, final JsonGenerator jgen, SerializerProvid
             jgen.writeStartArray();
             value.accumulate(
                 null,
-                new Accumulator<Object, Object>()
+                new Accumulator<>()
                 {
                   // Save allocations in jgen.writeObject by caching serializer.
                   JsonSerializer<Object> serializer = null;
@@ -133,7 +133,7 @@ public Object accumulate(Object ignored, Object object)
     );
     addSerializer(
         Yielder.class,
-        new JsonSerializer<Yielder>()
+        new JsonSerializer<>()
         {
           @SuppressWarnings("unchecked")
           @Override
@@ -174,7 +174,7 @@ public void serialize(Yielder yielder, final JsonGenerator jgen, SerializerProvi
     addSerializer(ByteOrder.class, ToStringSerializer.instance);
     addDeserializer(
         ByteOrder.class,
-        new JsonDeserializer<ByteOrder>()
+        new JsonDeserializer<>()
         {
           @Override
           public ByteOrder deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java b/processing/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java
index a26bcf4dd200..ac8da7af1f57 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java
@@ -59,7 +59,7 @@ public static <T> CloseableIterator<T> mergeSorted(
 
   public static <T> CloseableIterator<T> wrap(Iterator<T> innerIterator, @Nullable Closeable closeable)
   {
-    return new CloseableIterator<T>()
+    return new CloseableIterator<>()
     {
       private boolean closed;
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/JodaUtils.java b/processing/src/main/java/org/apache/druid/java/util/common/JodaUtils.java
index 54ec9411a2b2..ad83f5d983b8 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/JodaUtils.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/JodaUtils.java
@@ -104,7 +104,7 @@ public static Iterator<Interval> condensedIntervalsIterator(Iterator<Interval> s
             )
         );
 
-    return new Iterator<Interval>()
+    return new Iterator<>()
     {
       private Interval previous;
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java b/processing/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java
index 72cdaf15edf2..70e7aa18a2b0 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java
@@ -47,7 +47,7 @@ public static void scheduleWithFixedDelay(
         exec,
         initialDelay,
         delay,
-        new Callable<Signal>()
+        new Callable<>()
         {
           @Override
           public Signal call()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java b/processing/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java
index cea559f055a7..5ba543bbfc08 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java
@@ -35,7 +35,7 @@ public Coercer<Duration> accept(Class<?> clazz)
       return null;
     }
 
-    return new Coercer<Duration>()
+    return new Coercer<>()
     {
       @Override
       public Duration coerce(String value)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java b/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java
index b841eb541938..35a503e6ba18 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java
@@ -41,7 +41,7 @@
 
 public abstract class Granularity implements Cacheable
 {
-  public static final Comparator<Granularity> IS_FINER_THAN = new Comparator<Granularity>()
+  public static final Comparator<Granularity> IS_FINER_THAN = new Comparator<>()
   {
     @Override
     /**
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java
index 8a47398c4917..9e1b9fa95132 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java
@@ -27,7 +27,7 @@ public class Accumulators
 {
   public static <ListType extends List<T>, T> Accumulator<ListType, T> list()
   {
-    return new Accumulator<ListType, T>()
+    return new Accumulator<>()
     {
       @Override
       public ListType accumulate(ListType accumulated, T in)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java
index bb849fa6598e..c46aef033b74 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java
@@ -97,7 +97,7 @@ private <OutType> Yielder<OutType> makeYielder(
       final IterType iter
   )
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       OutType retVal = retValue;
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java
index 9eb4578820b1..618698c4ac46 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java
@@ -31,7 +31,7 @@
  */
 public class Comparators
 {
-  private static final Ordering<Object> ALWAYS_EQUAL = new Ordering<Object>()
+  private static final Ordering<Object> ALWAYS_EQUAL = new Ordering<>()
   {
     @SuppressWarnings("ComparatorMethodParameterNotUsed")
     @Override
@@ -75,7 +75,7 @@ public static <T extends Comparable<? super T>> Ordering<T> naturalNullsFirst()
     return NATURAL_NULLS_FIRST;
   }
 
-  private static final Comparator<Interval> INTERVAL_BY_START_THEN_END = new Comparator<Interval>()
+  private static final Comparator<Interval> INTERVAL_BY_START_THEN_END = new Comparator<>()
   {
     private final DateTimeComparator dateTimeComp = DateTimeComparator.getInstance();
 
@@ -97,7 +97,7 @@ public int compare(Interval lhs, Interval rhs)
     }
   };
 
-  private static final Comparator<Interval> INTERVAL_BY_END_THEN_START = new Comparator<Interval>()
+  private static final Comparator<Interval> INTERVAL_BY_END_THEN_START = new Comparator<>()
   {
     private final DateTimeComparator dateTimeComp = DateTimeComparator.getInstance();
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
index ca1ff489eee9..3a02d84471fd 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
@@ -50,7 +50,7 @@ public <OutType> Yielder<OutType> toYielder(
   {
     Yielder<Sequence<T>> yielderYielder = baseSequences.toYielder(
         null,
-        new YieldingAccumulator<Sequence<T>, Sequence<T>>()
+        new YieldingAccumulator<>()
         {
           @Override
           public Sequence<T> accumulate(Sequence<T> accumulated, Sequence<T> in)
@@ -119,7 +119,7 @@ private <OutType> Yielder<OutType> wrapYielder(
       return makeYielder(yielderYielder.next(null), nextInit, accumulator);
     }
 
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/ExplodingSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/ExplodingSequence.java
index 5468a5d86033..e89dae5430af 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/ExplodingSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/ExplodingSequence.java
@@ -55,7 +55,7 @@ public long getCloseCount()
 
   private <OutType> Yielder<OutType> wrapYielder(final Yielder<OutType> baseYielder)
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java
index 81210d76c267..a10c85c524a9 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java
@@ -58,7 +58,7 @@ private <OutType> Yielder<OutType> wrapYielder(
       final Yielder<OutType> yielder, final FilteringYieldingAccumulator<OutType, T> accumulator
   )
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
index ad35f418ffa7..103e26a673c1 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
@@ -65,7 +65,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
           (queue, in) -> {
             final Yielder<T> yielder = in.toYielder(
                 null,
-                new YieldingAccumulator<T, T>()
+                new YieldingAccumulator<>()
                 {
                   @Override
                   public T accumulate(T accumulated, T in)
@@ -159,7 +159,7 @@ private <OutType> Yielder<OutType> makeYielder(
     }
 
     final OutType yieldVal = retVal;
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequence.java
index 53b7d68636dc..abf6e29ae8fa 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequence.java
@@ -205,12 +205,12 @@ static <T> Sequence<T> makeOutputSequenceForQueue(
   )
   {
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<T, Iterator<T>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<T> make()
           {
-            return new Iterator<T>()
+            return new Iterator<>()
             {
               private ResultBatch<T> currentBatch;
 
@@ -777,7 +777,7 @@ protected void compute()
           }
         }
         if (!cancellationGizmo.isCanceled() && !cursors.isEmpty()) {
-          getPool().execute(new MergeCombineAction<T>(
+          getPool().execute(new MergeCombineAction<>(
               cursors,
               outputQueue,
               orderingFn,
@@ -931,7 +931,7 @@ static <E> Yielder<ResultBatch<E>> fromSequence(Sequence<E> sequence, int batchS
     {
       return sequence.toYielder(
           new ResultBatch<>(batchSize),
-          new YieldingAccumulator<ResultBatch<E>, E>()
+          new YieldingAccumulator<>()
           {
             int count = 0;
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
index e66ba29e4d7c..15f878af1304 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
@@ -106,7 +106,7 @@ public static <T> Sequence<T> withEffect(final Sequence<T> seq, final Runnable e
     // instead of extending YieldingSequenceBase, it's not possible to distinguish exception thrown during elements
     // processing in accumulate() of the underlying seq, from exception thrown after all elements are processed,
     // in close().
-    return new YieldingSequenceBase<T>()
+    return new YieldingSequenceBase<>()
     {
       @Override
       public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulator<OutType, T> accumulator)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/SimpleSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/SimpleSequence.java
index 48fa4c688173..428738378563 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/SimpleSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/SimpleSequence.java
@@ -31,7 +31,7 @@ public class SimpleSequence<T> extends BaseSequence<T, Iterator<T>>
   SimpleSequence(final Iterable<T> iterable)
   {
     super(
-        new BaseSequence.IteratorMaker<T, Iterator<T>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<T> make()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/SkippingSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/SkippingSequence.java
index 4eba7a5473f6..db5d6d1c4e75 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/SkippingSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/SkippingSequence.java
@@ -53,7 +53,7 @@ private <OutType> Yielder<OutType> wrapYielder(
       final SkippingYieldingAccumulator<OutType> accumulator
   )
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/TopNSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/TopNSequence.java
index 0b37c0022e5d..79ff44718228 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/TopNSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/TopNSequence.java
@@ -39,7 +39,7 @@ public TopNSequence(
   )
   {
     super(
-        new IteratorMaker<T, Iterator<T>>()
+        new IteratorMaker<>()
         {
           @Override
           public Iterator<T> make()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
index 39889fc5997e..da80b256f25d 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
@@ -42,7 +42,7 @@ public <OutType> OutType accumulate(final OutType outType, final Accumulator<Out
     OutType result;
     try {
       wrapper.before();
-      result = wrapper.wrap(new Supplier<OutType>()
+      result = wrapper.wrap(new Supplier<>()
       {
         @Override
         public OutType get()
@@ -80,7 +80,7 @@ public <OutType> Yielder<OutType> toYielder(
   {
     try {
       wrapper.before();
-      return wrapper.wrap(new Supplier<Yielder<OutType>>()
+      return wrapper.wrap(new Supplier<>()
       {
         @Override
         public Yielder<OutType> get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
index fe52ce7fbb3e..4faa769a2c43 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
@@ -45,7 +45,7 @@ public OutType get()
   public Yielder<OutType> next(final OutType initValue)
   {
     try {
-      return wrapper.wrap(new Supplier<Yielder<OutType>>()
+      return wrapper.wrap(new Supplier<>()
       {
         @Override
         public Yielder<OutType> get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
index fbd1db105286..7b6bf49b3fb6 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
@@ -31,7 +31,7 @@ public static <T> Yielder<T> each(final Sequence<T> sequence)
   {
     return sequence.toYielder(
         null,
-        new YieldingAccumulator<T, T>()
+        new YieldingAccumulator<>()
         {
           @Override
           public T accumulate(T accumulated, T in)
@@ -45,7 +45,7 @@ public T accumulate(T accumulated, T in)
 
   public static <T> Yielder<T> done(final T finalVal, final AutoCloseable closeable)
   {
-    return new Yielder<T>()
+    return new Yielder<>()
     {
       @Override
       public T get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java
index a00562d9909b..3ba84930d52b 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java
@@ -27,7 +27,7 @@ public static <AccumulatedType, InType> YieldingAccumulator<AccumulatedType, InT
       final Accumulator<AccumulatedType, InType> accumulator
   )
   {
-    return new YieldingAccumulator<AccumulatedType, InType>()
+    return new YieldingAccumulator<>()
     {
       @Override
       public AccumulatedType accumulate(AccumulatedType accumulated, InType in)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java b/processing/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java
index b02de3ce4932..ed6567bf9313 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java
@@ -39,17 +39,11 @@
 public final class JacksonUtils
 {
   public static final TypeReference<Map<String, Object>> TYPE_REFERENCE_MAP_STRING_OBJECT =
-      new TypeReference<Map<String, Object>>()
-      {
-      };
+      new TypeReference<>() {};
   public static final TypeReference<Map<String, String>> TYPE_REFERENCE_MAP_STRING_STRING =
-      new TypeReference<Map<String, String>>()
-      {
-      };
+      new TypeReference<>() {};
   public static final TypeReference<Map<String, Boolean>> TYPE_REFERENCE_MAP_STRING_BOOLEAN =
-      new TypeReference<Map<String, Boolean>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private JacksonUtils()
   {
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java
index 7b81934367d1..dbd9bff58215 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java
@@ -34,7 +34,7 @@ default <R> CloseableIterator<R> map(Function<T, R> mapFunction)
   {
     final CloseableIterator<T> delegate = this;
 
-    return new CloseableIterator<R>()
+    return new CloseableIterator<>()
     {
       @Override
       public boolean hasNext()
@@ -63,7 +63,7 @@ default <R> CloseableIterator<R> flatMap(Function<T, CloseableIterator<R>> funct
   {
     final CloseableIterator<T> outerIterator = this;
 
-    return new CloseableIterator<R>()
+    return new CloseableIterator<>()
     {
       CloseableIterator<R> currInnerIterator = null;
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIteratorWithMetadata.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIteratorWithMetadata.java
index e1e4895ce2ef..0a26d2ba5358 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIteratorWithMetadata.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIteratorWithMetadata.java
@@ -50,7 +50,7 @@ public interface CloseableIteratorWithMetadata<T> extends CloseableIterator<T>
    */
   static <T> CloseableIteratorWithMetadata<T> withEmptyMetadata(CloseableIterator<T> delegate)
   {
-    return new CloseableIteratorWithMetadata<T>()
+    return new CloseableIteratorWithMetadata<>()
     {
 
       @Override
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java
index 166833cc061f..8776d300586f 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java
@@ -47,7 +47,7 @@
 @Deprecated
 public class JSONToLowerParser implements Parser<String, Object>
 {
-  private static final Function<JsonNode, Object> VALUE_FUNCTION = new Function<JsonNode, Object>()
+  private static final Function<JsonNode, Object> VALUE_FUNCTION = new Function<>()
   {
     @Override
     public Object apply(JsonNode node)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java
index 8a307e58efb8..f3c676bb6c5a 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java
@@ -42,7 +42,7 @@ private static Function<Object, Object> compile(String function)
     final org.mozilla.javascript.Function fn = context.compileFunction(scope, function, "fn", 1, null);
     Context.exit();
 
-    return new Function<Object, Object>()
+    return new Function<>()
     {
       @Override
       public Object apply(Object input)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java
index 2c76c14c7b79..496f5a766bd1 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java
@@ -78,12 +78,12 @@ public static <T> ObjectFlattener<T> create(
       }
     }
 
-    return new ObjectFlattener<T>()
+    return new ObjectFlattener<>()
     {
       @Override
       public Map<String, Object> flatten(final T obj)
       {
-        return new AbstractMap<String, Object>()
+        return new AbstractMap<>()
         {
           @Override
           public int size()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java
index 010696ca2797..15b4f235187c 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java
@@ -55,7 +55,7 @@ public RegexParser(
     this.listSplitter = Splitter.onPattern(listDelimiter.isPresent()
                                            ? listDelimiter.get()
                                            : Parsers.DEFAULT_LIST_DELIMITER);
-    this.valueFunction = new Function<String, Object>()
+    this.valueFunction = new Function<>()
     {
       @Override
       public Object apply(String input)
diff --git a/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java b/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
index f70b7e7d3fd8..879aba3d8b70 100644
--- a/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
+++ b/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
@@ -659,7 +659,7 @@ private boolean sendWithRetries(final byte[] buffer, final int length, final int
       long deadLineMillis = System.currentTimeMillis() + computeTimeoutForSendRequestInMillis(lastBatchFillTimeMillis);
       try {
         RetryUtils.retry(
-            new RetryUtils.Task<Object>()
+            new RetryUtils.Task<>()
             {
               @Override
               public Void perform() throws Exception
@@ -668,7 +668,7 @@ public Void perform() throws Exception
                 return null;
               }
             },
-            new Predicate<Throwable>()
+            new Predicate<>()
             {
               @Override
               public boolean apply(Throwable e)
diff --git a/processing/src/main/java/org/apache/druid/java/util/http/client/Request.java b/processing/src/main/java/org/apache/druid/java/util/http/client/Request.java
index 479468090e6b..bee0aeb167bc 100644
--- a/processing/src/main/java/org/apache/druid/java/util/http/client/Request.java
+++ b/processing/src/main/java/org/apache/druid/java/util/http/client/Request.java
@@ -49,7 +49,7 @@ public class Request
   private final URL url;
   private final Multimap<String, String> headers = Multimaps.newListMultimap(
       new HashMap<>(),
-      new Supplier<List<String>>()
+      new Supplier<>()
       {
         @Override
         public List<String> get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java b/processing/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
index 2476e4c9ebfd..dfa9903b9001 100644
--- a/processing/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
+++ b/processing/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
@@ -63,7 +63,7 @@ public ResourcePool(final ResourceFactory<K, V> factory, final ResourcePoolConfi
                       final boolean eagerInitialization)
   {
     this.pool = CacheBuilder.newBuilder().build(
-        new CacheLoader<K, ResourceHolderPerKey<K, V>>()
+        new CacheLoader<>()
         {
           @Override
           public ResourceHolderPerKey<K, V> load(K input)
@@ -108,7 +108,7 @@ public ResourceContainer<V> take(final K key)
     }
     final V value = holder.get();
 
-    return new ResourceContainer<V>()
+    return new ResourceContainer<>()
     {
       private final AtomicBoolean returned = new AtomicBoolean(false);
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java b/processing/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
index e1094ba8908b..f988ffedb58a 100644
--- a/processing/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
+++ b/processing/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
@@ -70,7 +70,7 @@ public ClientResponse<InputStream> handleResponse(HttpResponse response, Traffic
     byteCount.addAndGet(response.getContent().readableBytes());
     return ClientResponse.finished(
         new SequenceInputStream(
-            new Enumeration<InputStream>()
+            new Enumeration<>()
             {
               @Override
               public boolean hasMoreElements()
diff --git a/processing/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java b/processing/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java
index c1a3bae768cb..50ae6767be69 100644
--- a/processing/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java
+++ b/processing/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java
@@ -28,7 +28,7 @@ public class KeyedDiff
 {
   private static final Logger log = new Logger(KeyedDiff.class);
 
-  private final Map<String, Map<String, Long>> prevs = new HashMap<String, Map<String, Long>>();
+  private final Map<String, Map<String, Long>> prevs = new HashMap<>();
 
   public Map<String, Long> to(String key, Map<String, Long> curr)
   {
diff --git a/processing/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java b/processing/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java
index ee3627986c9f..6082fb261e38 100644
--- a/processing/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java
+++ b/processing/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java
@@ -85,7 +85,7 @@ public SysMonitor(Map<String, String[]> dimensions, String feed)
 
     sigar.enableLogging(true);
 
-    this.statsList = new ArrayList<Stats>();
+    this.statsList = new ArrayList<>();
     this.statsList.addAll(
         Arrays.asList(
             new MemStats(),
diff --git a/processing/src/main/java/org/apache/druid/math/expr/CartesianList.java b/processing/src/main/java/org/apache/druid/math/expr/CartesianList.java
index d1373bd62a4b..ac2d17d2ae36 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/CartesianList.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/CartesianList.java
@@ -51,7 +51,7 @@ public static <E> List<List<E>> create(List<? extends List<? extends E>> lists)
       }
       axesBuilder.add(new ArrayList<>(list));
     }
-    return new CartesianList<E>(axesBuilder);
+    return new CartesianList<>(axesBuilder);
   }
 
   CartesianList(List<List<? extends E>> axes)
@@ -103,7 +103,7 @@ public int indexOf(Object o)
   public List<E> get(final int index)
   {
     Preconditions.checkElementIndex(index, size());
-    return new AbstractList<E>()
+    return new AbstractList<>()
     {
       @Override
       public int size()
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java b/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java
index 9d3c847e2089..e2f823eae28e 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java
@@ -124,7 +124,7 @@ public String toString()
   @Override
   public Expr asSingleThreaded(InputBindingInspector inspector)
   {
-    return new ExprEvalBasedConstantExpr<T>(realEval());
+    return new ExprEvalBasedConstantExpr<>(realEval());
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java b/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java
index 33e4c82cbe8a..d5d3933b860b 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java
@@ -95,7 +95,7 @@ public static <T> ExprVectorProcessor<T> constant(@Nullable Object constant, int
     final Object[] objects = new Object[maxVectorSize];
     Arrays.fill(objects, constant);
     final ExprEvalObjectVector eval = new ExprEvalObjectVector(objects, type);
-    return new ExprVectorProcessor<T>()
+    return new ExprVectorProcessor<>()
     {
       @Override
       public ExprEvalVector<T> evalVector(Expr.VectorInputBinding bindings)
@@ -132,7 +132,7 @@ public static <T> ExprVectorProcessor<T> constant(@Nullable Double constant, int
       Arrays.fill(doubles, constant);
     }
     final ExprEvalDoubleVector eval = new ExprEvalDoubleVector(doubles, nulls);
-    return new ExprVectorProcessor<T>()
+    return new ExprVectorProcessor<>()
     {
       @Override
       public ExprEvalVector<T> evalVector(Expr.VectorInputBinding bindings)
@@ -169,7 +169,7 @@ public static <T> ExprVectorProcessor<T> constant(@Nullable Long constant, int m
       Arrays.fill(longs, constant);
     }
     final ExprEvalLongVector eval = new ExprEvalLongVector(longs, nulls);
-    return new ExprVectorProcessor<T>()
+    return new ExprVectorProcessor<>()
     {
       @Override
       public ExprEvalVector<T> evalVector(Expr.VectorInputBinding bindings)
diff --git a/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java b/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java
index c8485814b595..4cc5a9fbd2d1 100644
--- a/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java
@@ -81,8 +81,8 @@ public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext respo
     final int priority = query.context().getPriority();
     final Ordering ordering = query.getResultOrdering();
     final QueryPlus<T> threadSafeQueryPlus = queryPlus.withoutThreadUnsafeState();
-    return new BaseSequence<T, Iterator<T>>(
-        new BaseSequence.IteratorMaker<T, Iterator<T>>()
+    return new BaseSequence<>(
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<T> make()
@@ -98,7 +98,7 @@ public Iterator<T> make()
                           }
 
                           return queryProcessingPool.submitRunnerTask(
-                              new AbstractPrioritizedQueryRunnerCallable<Iterable<T>, T>(priority, input)
+                              new AbstractPrioritizedQueryRunnerCallable<>(priority, input)
                               {
                                 @Override
                                 public Iterable<T> call()
diff --git a/processing/src/main/java/org/apache/druid/query/ConcatQueryRunner.java b/processing/src/main/java/org/apache/druid/query/ConcatQueryRunner.java
index 1a22b3e5e52f..3647521afcae 100644
--- a/processing/src/main/java/org/apache/druid/query/ConcatQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/ConcatQueryRunner.java
@@ -41,7 +41,7 @@ public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext respo
     return Sequences.concat(
         Sequences.map(
             queryRunners,
-            new Function<QueryRunner<T>, Sequence<T>>()
+            new Function<>()
             {
               @Override
               public Sequence<T> apply(final QueryRunner<T> input)
diff --git a/processing/src/main/java/org/apache/druid/query/Druids.java b/processing/src/main/java/org/apache/druid/query/Druids.java
index aad70c9ecb5d..5ce472c9b31e 100644
--- a/processing/src/main/java/org/apache/druid/query/Druids.java
+++ b/processing/src/main/java/org/apache/druid/query/Druids.java
@@ -71,7 +71,7 @@
  */
 public class Druids
 {
-  public static final Function<String, DimensionSpec> DIMENSION_IDENTITY = new Function<String, DimensionSpec>()
+  public static final Function<String, DimensionSpec> DIMENSION_IDENTITY = new Function<>()
   {
     @Nullable
     @Override
diff --git a/processing/src/main/java/org/apache/druid/query/FluentQueryRunner.java b/processing/src/main/java/org/apache/druid/query/FluentQueryRunner.java
index e6f52d47b541..25c783ed7615 100644
--- a/processing/src/main/java/org/apache/druid/query/FluentQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/FluentQueryRunner.java
@@ -54,7 +54,7 @@ public Sequence<T> run(QueryPlus<T> queryPlus, ResponseContext responseContext)
 
   public FluentQueryRunner<T> from(QueryRunner<T> runner)
   {
-    return new FluentQueryRunner<T>(runner, toolChest);
+    return new FluentQueryRunner<>(runner, toolChest);
   }
 
   public FluentQueryRunner<T> applyPostMergeDecoration()
diff --git a/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java b/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java
index 68d3db9a36d3..c821d061a5e9 100644
--- a/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java
+++ b/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java
@@ -103,7 +103,7 @@ public Sequence<Object[]> getRowsAsSequence()
               .collect(Collectors.toList());
 
           return Sequences.simple(
-              () -> new Iterator<Object[]>()
+              () -> new Iterator<>()
               {
                 @Override
                 public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/query/IterableRowsCursorHelper.java b/processing/src/main/java/org/apache/druid/query/IterableRowsCursorHelper.java
index 46a39ad4cb52..8120a8f5645a 100644
--- a/processing/src/main/java/org/apache/druid/query/IterableRowsCursorHelper.java
+++ b/processing/src/main/java/org/apache/druid/query/IterableRowsCursorHelper.java
@@ -86,13 +86,13 @@ public static Pair<Cursor, Closeable> getCursorFromSequence(Sequence<Object[]> r
   public static Pair<Cursor, Closeable> getCursorFromYielder(Yielder<Object[]> yielderParam, RowSignature rowSignature)
   {
     return getCursorFromIterable(
-        new Iterable<Object[]>()
+        new Iterable<>()
         {
           Yielder<Object[]> yielder = yielderParam;
           @Override
           public Iterator<Object[]> iterator()
           {
-            return new Iterator<Object[]>()
+            return new Iterator<>()
             {
               @Override
               public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/query/PrioritizedExecutorService.java b/processing/src/main/java/org/apache/druid/query/PrioritizedExecutorService.java
index 02636df107ff..af14e4cc83bf 100644
--- a/processing/src/main/java/org/apache/druid/query/PrioritizedExecutorService.java
+++ b/processing/src/main/java/org/apache/druid/query/PrioritizedExecutorService.java
@@ -53,7 +53,7 @@ public static PrioritizedExecutorService create(Lifecycle lifecycle, DruidProces
             config.getNumThreads(),
             0L,
             TimeUnit.MILLISECONDS,
-            new PriorityBlockingQueue<Runnable>(),
+            new PriorityBlockingQueue<>(),
             new ThreadFactoryBuilder().setDaemon(true).setNameFormat(config.getFormatString()).build()
         ),
         config
@@ -227,7 +227,7 @@ public int compare(PrioritizedListenableFutureTask left, PrioritizedListenableFu
       return Integer.compare(right.getPriority(), left.getPriority());
     }
   }.compound(
-      new Ordering<PrioritizedListenableFutureTask>()
+      new Ordering<>()
       {
         @Override
         public int compare(PrioritizedListenableFutureTask left, PrioritizedListenableFutureTask right)
diff --git a/processing/src/main/java/org/apache/druid/query/QueryRunnerHelper.java b/processing/src/main/java/org/apache/druid/query/QueryRunnerHelper.java
index bb9837bac2d0..042dd707406b 100644
--- a/processing/src/main/java/org/apache/druid/query/QueryRunnerHelper.java
+++ b/processing/src/main/java/org/apache/druid/query/QueryRunnerHelper.java
@@ -32,7 +32,7 @@ public class QueryRunnerHelper
 
   public static <T> QueryRunner<T> makeClosingQueryRunner(final QueryRunner<T> runner, final Closeable closeable)
   {
-    return new QueryRunner<T>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<T> run(QueryPlus<T> queryPlus, ResponseContext responseContext)
diff --git a/processing/src/main/java/org/apache/druid/query/SinkQueryRunners.java b/processing/src/main/java/org/apache/druid/query/SinkQueryRunners.java
index 9cec39a61b13..8b2224e5b7a9 100644
--- a/processing/src/main/java/org/apache/druid/query/SinkQueryRunners.java
+++ b/processing/src/main/java/org/apache/druid/query/SinkQueryRunners.java
@@ -42,7 +42,7 @@ public Iterator<Pair<Interval, QueryRunner<T>>> runnerIntervalMappingIterator()
   public Iterator<QueryRunner<T>> iterator()
   {
     Iterator<Pair<Interval, QueryRunner<T>>> runnerIntervalIterator = runners.iterator();
-    return new Iterator<QueryRunner<T>>()
+    return new Iterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/query/TimewarpOperator.java b/processing/src/main/java/org/apache/druid/query/TimewarpOperator.java
index 88c88b324890..78e409075a46 100644
--- a/processing/src/main/java/org/apache/druid/query/TimewarpOperator.java
+++ b/processing/src/main/java/org/apache/druid/query/TimewarpOperator.java
@@ -76,7 +76,7 @@ public QueryRunner<T> postProcess(QueryRunner<T> baseQueryRunner)
 
   public QueryRunner<T> postProcess(final QueryRunner<T> baseRunner, final long now)
   {
-    return new QueryRunner<T>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext responseContext)
@@ -99,7 +99,7 @@ public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext respo
                 ),
                 responseContext
             ),
-            new Function<T, T>()
+            new Function<>()
             {
               @Override
               public T apply(T input)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/AbstractSerializableLongObjectPairSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/AbstractSerializableLongObjectPairSerde.java
index 75274555cf3c..2304e739c94f 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/AbstractSerializableLongObjectPairSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/AbstractSerializableLongObjectPairSerde.java
@@ -42,7 +42,7 @@ public abstract class AbstractSerializableLongObjectPairSerde<T extends Serializ
   @Override
   public ComplexMetricExtractor<?> getExtractor()
   {
-    return new ComplexMetricExtractor<Object>()
+    return new ComplexMetricExtractor<>()
     {
       @Override
       public Class<T> extractedClass()
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerde.java
index 15b36d6182d1..692639e87c0c 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerde.java
@@ -84,7 +84,7 @@ public void deserializeColumn(ByteBuffer buffer, ColumnBuilder columnBuilder)
   @Override
   public ObjectStrategy<SerializablePairLongDouble> getObjectStrategy()
   {
-    return new ObjectStrategy<SerializablePairLongDouble>()
+    return new ObjectStrategy<>()
     {
       @Override
       public int compare(SerializablePairLongDouble o1, SerializablePairLongDouble o2)
@@ -128,7 +128,7 @@ public TypeStrategy<SerializablePairLongDouble> getTypeStrategy()
     return new ObjectStrategyComplexTypeStrategy<>(
         getObjectStrategy(),
         ColumnType.ofComplex(getTypeName()),
-        new Hash.Strategy<SerializablePairLongDouble>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(SerializablePairLongDouble o)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerde.java
index 4df89153caf9..9c5841be9354 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerde.java
@@ -85,7 +85,7 @@ public void deserializeColumn(ByteBuffer buffer, ColumnBuilder columnBuilder)
   @Override
   public ObjectStrategy<SerializablePairLongFloat> getObjectStrategy()
   {
-    return new ObjectStrategy<SerializablePairLongFloat>()
+    return new ObjectStrategy<>()
     {
       @Override
       public int compare(SerializablePairLongFloat o1, SerializablePairLongFloat o2)
@@ -129,7 +129,7 @@ public TypeStrategy<SerializablePairLongFloat> getTypeStrategy()
     return new ObjectStrategyComplexTypeStrategy<>(
         getObjectStrategy(),
         ColumnType.ofComplex(getTypeName()),
-        new Hash.Strategy<SerializablePairLongFloat>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(SerializablePairLongFloat o)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerde.java
index 00f4c6a6ab8b..2be1d434c442 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerde.java
@@ -84,7 +84,7 @@ public void deserializeColumn(ByteBuffer buffer, ColumnBuilder columnBuilder)
   @Override
   public ObjectStrategy<SerializablePairLongLong> getObjectStrategy()
   {
-    return new ObjectStrategy<SerializablePairLongLong>()
+    return new ObjectStrategy<>()
     {
       @Override
       public int compare(SerializablePairLongLong o1, SerializablePairLongLong o2)
@@ -128,7 +128,7 @@ public TypeStrategy<SerializablePairLongLong> getTypeStrategy()
     return new ObjectStrategyComplexTypeStrategy<>(
         getObjectStrategy(),
         ColumnType.ofComplex(getTypeName()),
-        new Hash.Strategy<SerializablePairLongLong>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(SerializablePairLongLong o)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerde.java
index fa393a5f2201..4f3171d8f673 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerde.java
@@ -102,7 +102,7 @@ public String getTypeName()
   @Override
   public ComplexMetricExtractor<?> getExtractor()
   {
-    return new ComplexMetricExtractor<Object>()
+    return new ComplexMetricExtractor<>()
     {
       @Override
       public Class<SerializablePairLongString> extractedClass()
@@ -137,7 +137,7 @@ public void deserializeColumn(ByteBuffer buffer, ColumnBuilder columnBuilder)
   @Override
   public ObjectStrategy<SerializablePairLongString> getObjectStrategy()
   {
-    return new ObjectStrategy<SerializablePairLongString>()
+    return new ObjectStrategy<>()
     {
       @Override
       public int compare(@Nullable SerializablePairLongString o1, @Nullable SerializablePairLongString o2)
@@ -176,7 +176,7 @@ public TypeStrategy<SerializablePairLongString> getTypeStrategy()
     return new ObjectStrategyComplexTypeStrategy<>(
         getObjectStrategy(),
         ColumnType.ofComplex(getTypeName()),
-        new Hash.Strategy<SerializablePairLongString>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(SerializablePairLongString o)
@@ -215,7 +215,7 @@ public GenericColumnSerializer<?> getSerializer(
   }
 
   private static final ObjectStrategy<SerializablePairLongString> LEGACY_STRATEGY =
-      new ObjectStrategy<SerializablePairLongString>()
+      new ObjectStrategy<>()
       {
         @Override
         public int compare(@Nullable SerializablePairLongString o1, @Nullable SerializablePairLongString o2)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java
index 5f2297b65521..bd2b06697d0f 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java
@@ -67,7 +67,7 @@ private static List<String> makeRequiredFieldNamesFromFields(List<DimensionSpec>
     return ImmutableList.copyOf(
         Lists.transform(
             fields,
-            new Function<DimensionSpec, String>()
+            new Function<>()
             {
               @Override
               public String apply(DimensionSpec input)
@@ -84,7 +84,7 @@ private static List<DimensionSpec> makeFieldsFromFieldNames(List<String> fieldNa
     return ImmutableList.copyOf(
         Lists.transform(
             fieldNames,
-            new Function<String, DimensionSpec>()
+            new Function<>()
             {
               @Override
               public DimensionSpec apply(String input)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java
index eabcc4333308..bd8c9093f93c 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java
@@ -58,7 +58,7 @@ public String getTypeName()
   @Override
   public ComplexMetricExtractor<HyperLogLogCollector> getExtractor()
   {
-    return new ComplexMetricExtractor<HyperLogLogCollector>()
+    return new ComplexMetricExtractor<>()
     {
       @Override
       public Class<HyperLogLogCollector> extractedClass()
diff --git a/processing/src/main/java/org/apache/druid/query/context/ResponseContext.java b/processing/src/main/java/org/apache/druid/query/context/ResponseContext.java
index 6727782cc406..a2a068207188 100644
--- a/processing/src/main/java/org/apache/druid/query/context/ResponseContext.java
+++ b/processing/src/main/java/org/apache/druid/query/context/ResponseContext.java
@@ -324,7 +324,7 @@ public static class Keys
       @SuppressWarnings("unchecked")
       public Object mergeValues(Object oldValue, Object newValue)
       {
-        final List<Interval> result = new ArrayList<Interval>((List<Interval>) oldValue);
+        final List<Interval> result = new ArrayList<>((List<Interval>) oldValue);
         result.addAll((List<Interval>) newValue);
         return result;
       }
@@ -385,7 +385,7 @@ public Object mergeValues(Object totalRemainingPerId, Object idAndNumResponses)
       @SuppressWarnings("unchecked")
       public Object mergeValues(Object oldValue, Object newValue)
       {
-        final List<SegmentDescriptor> result = new ArrayList<SegmentDescriptor>((List<SegmentDescriptor>) oldValue);
+        final List<SegmentDescriptor> result = new ArrayList<>((List<SegmentDescriptor>) oldValue);
         result.addAll((List<SegmentDescriptor>) newValue);
         return result;
       }
diff --git a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java
index 2b4a0cbb5715..0a5ef2a7680a 100644
--- a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java
@@ -103,7 +103,7 @@ public Sequence<Result<DataSourceMetadataResultValue>> run(
       final DataSourceMetadataQuery legacyQuery = (DataSourceMetadataQuery) query;
 
       return new BaseSequence<>(
-          new BaseSequence.IteratorMaker<Result<DataSourceMetadataResultValue>, Iterator<Result<DataSourceMetadataResultValue>>>()
+          new BaseSequence.IteratorMaker<>()
           {
             @Override
             public Iterator<Result<DataSourceMetadataResultValue>> make()
diff --git a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java
index 21fb5c53afcc..e91a4004007c 100644
--- a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java
@@ -49,7 +49,7 @@ public class DataSourceQueryQueryToolChest
     extends QueryToolChest<Result<DataSourceMetadataResultValue>, DataSourceMetadataQuery>
 {
   private static final TypeReference<Result<DataSourceMetadataResultValue>> TYPE_REFERENCE =
-      new TypeReference<Result<DataSourceMetadataResultValue>>() {};
+      new TypeReference<>() {};
 
   private final GenericQueryMetricsFactory queryMetricsFactory;
 
@@ -78,7 +78,7 @@ public QueryRunner<Result<DataSourceMetadataResultValue>> mergeResults(
       final QueryRunner<Result<DataSourceMetadataResultValue>> runner
   )
   {
-    return new BySegmentSkippingQueryRunner<Result<DataSourceMetadataResultValue>>(runner)
+    return new BySegmentSkippingQueryRunner<>(runner)
     {
       @Override
       protected Sequence<Result<DataSourceMetadataResultValue>> doRun(
diff --git a/processing/src/main/java/org/apache/druid/query/extraction/FunctionalExtraction.java b/processing/src/main/java/org/apache/druid/query/extraction/FunctionalExtraction.java
index c01a21d109f3..ec58aa08ed77 100644
--- a/processing/src/main/java/org/apache/druid/query/extraction/FunctionalExtraction.java
+++ b/processing/src/main/java/org/apache/druid/query/extraction/FunctionalExtraction.java
@@ -62,7 +62,7 @@ public FunctionalExtraction(
     // This is intended to have the absolutely fastest code path possible and not have any extra logic in the function
     if (this.retainMissingValue) {
 
-      this.extractionFunction = new Function<String, String>()
+      this.extractionFunction = new Function<>()
       {
         @Nullable
         @Override
@@ -73,7 +73,7 @@ public String apply(@Nullable String dimValue)
         }
       };
     } else {
-      this.extractionFunction = new Function<String, String>()
+      this.extractionFunction = new Function<>()
       {
         @Nullable
         @Override
diff --git a/processing/src/main/java/org/apache/druid/query/extraction/JavaScriptExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/JavaScriptExtractionFn.java
index 679121b699d8..ad73cff52f3a 100644
--- a/processing/src/main/java/org/apache/druid/query/extraction/JavaScriptExtractionFn.java
+++ b/processing/src/main/java/org/apache/druid/query/extraction/JavaScriptExtractionFn.java
@@ -50,7 +50,7 @@ private static Function<Object, String> compile(String function)
     Context.exit();
 
 
-    return new Function<Object, String>()
+    return new Function<>()
     {
       @Override
       public String apply(Object input)
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java
index 83cd8cecac76..b5712ebdda38 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java
@@ -89,12 +89,8 @@ public class GroupByQueryQueryToolChest extends QueryToolChest<ResultRow, GroupB
 {
   private static final byte GROUPBY_QUERY = 0x14;
   private static final TypeReference<Object> OBJECT_TYPE_REFERENCE =
-      new TypeReference<Object>()
-      {
-      };
-  private static final TypeReference<ResultRow> TYPE_REFERENCE = new TypeReference<ResultRow>()
-  {
-  };
+      new TypeReference<>() {};
+  private static final TypeReference<ResultRow> TYPE_REFERENCE = new TypeReference<>() {};
 
   private final GroupingEngine groupingEngine;
   private final GroupByQueryConfig queryConfig;
@@ -501,7 +497,7 @@ public ObjectMapper decorateObjectMapper(final ObjectMapper objectMapper, final
   public QueryRunner<ResultRow> preMergeQueryDecoration(final QueryRunner<ResultRow> runner)
   {
     return new SubqueryQueryRunner<>(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -556,7 +552,7 @@ public CacheStrategy<ResultRow, Object, GroupByQuery> getCacheStrategy(
     }
     final Class<?>[] dimensionClasses = createDimensionClasses(query);
 
-    return new CacheStrategy<ResultRow, Object, GroupByQuery>()
+    return new CacheStrategy<>()
     {
       private static final byte CACHE_STRATEGY_VERSION = 0x1;
       private final List<AggregatorFactory> aggs = query.getAggregatorSpecs();
@@ -619,7 +615,7 @@ public Function<ResultRow, Object> prepareForCache(boolean isResultLevelCache)
       {
         final boolean resultRowHasTimestamp = query.getResultRowHasTimestamp();
 
-        return new Function<ResultRow, Object>()
+        return new Function<>()
         {
           @Override
           public Object apply(ResultRow resultRow)
@@ -657,7 +653,7 @@ public Function<Object, ResultRow> pullFromCache(boolean isResultLevelCache)
         final int aggregatorStart = query.getResultRowAggregatorStart();
         final int postAggregatorStart = query.getResultRowPostAggregatorStart();
 
-        return new Function<Object, ResultRow>()
+        return new Function<>()
         {
           private final Granularity granularity = query.getGranularity();
 
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryResources.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryResources.java
index 348e49d91a45..d756de5c5bab 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryResources.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryResources.java
@@ -184,7 +184,7 @@ private static ResourceHolder<ByteBuffer> getMergeBuffer(Deque<ByteBuffer> acqui
       throw DruidException.defensive("Insufficient free merge buffers present.");
     }
     final ByteBuffer buffer = acquiredBufferPool.pop();
-    return new ResourceHolder<ByteBuffer>()
+    return new ResourceHolder<>()
     {
       @Override
       public ByteBuffer get()
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/ResultRowObjectMapperDecoratorUtil.java b/processing/src/main/java/org/apache/druid/query/groupby/ResultRowObjectMapperDecoratorUtil.java
index 60b55ce74828..cf21a9f896ca 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/ResultRowObjectMapperDecoratorUtil.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/ResultRowObjectMapperDecoratorUtil.java
@@ -113,7 +113,7 @@ private static JsonDeserializer<ResultRow> getDeserializer(
     } else if (!arrayBasedRows && !dimensionsRequireConversion) {
       // We have to deserialize map based rows, however we don't have to deserialize the dimensions individually
       // Returns a deserializer that can deserialize both map and array based rows simultaneously
-      return new JsonDeserializer<ResultRow>()
+      return new JsonDeserializer<>()
       {
         @Override
         public ResultRow deserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException
@@ -129,7 +129,7 @@ public ResultRow deserialize(final JsonParser jp, final DeserializationContext c
 
     } else {
       // Dimensions need to be serialized individually because some of them require conversion to specialized types
-      return new JsonDeserializer<ResultRow>()
+      return new JsonDeserializer<>()
       {
         final JavaType[] javaTypes = createJavaTypesForResultRow(query);
 
@@ -192,7 +192,7 @@ private static JsonSerializer<ResultRow> getSerializer(
       return null;
     } else {
       if (resultAsArray) {
-        return new JsonSerializer<ResultRow>()
+        return new JsonSerializer<>()
         {
           @Override
           public void serialize(ResultRow resultRow, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
@@ -203,7 +203,7 @@ public void serialize(ResultRow resultRow, JsonGenerator jsonGenerator, Serializ
         };
 
       } else {
-        return new JsonSerializer<ResultRow>()
+        return new JsonSerializer<>()
         {
           @Override
           public void serialize(ResultRow resultRow, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferArrayGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferArrayGrouper.java
index 616ac190dd83..565afe285a06 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferArrayGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferArrayGrouper.java
@@ -292,7 +292,7 @@ public CloseableIterator<Entry<MemoryPointer>> iterator()
     final MemoryPointer reusableKey = new MemoryPointer(keyMemory, 0);
     final ReusableEntry<MemoryPointer> reusableEntry = new ReusableEntry<>(reusableKey, new Object[aggregators.size()]);
 
-    return new CloseableIterator<Entry<MemoryPointer>>()
+    return new CloseableIterator<>()
     {
       @Override
       public boolean hasNext()
@@ -324,7 +324,7 @@ public CloseableIterator<Entry<IntKey>> iterator(boolean sorted)
       throw new UnsupportedOperationException("sorted iterator is not supported yet");
     }
 
-    return new CloseableIterator<Entry<IntKey>>()
+    return new CloseableIterator<>()
     {
       final ReusableEntry<IntKey> reusableEntry =
           new ReusableEntry<>(new IntKey(0), new Object[aggregators.size()]);
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java
index 182a48577609..4970ebe9e83e 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java
@@ -165,7 +165,7 @@ public CloseableIterator<Entry<KeyType>> iterator(boolean sorted)
 
     if (sorted) {
       @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
-      final List<Integer> wrappedOffsets = new AbstractList<Integer>()
+      final List<Integer> wrappedOffsets = new AbstractList<>()
       {
         @Override
         public Integer get(int index)
@@ -212,7 +212,7 @@ public int size()
           }
       );
 
-      return new CloseableIterator<Entry<KeyType>>()
+      return new CloseableIterator<>()
       {
         final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.size());
 
@@ -248,7 +248,7 @@ public void close()
       };
     } else {
       // Unsorted iterator
-      return new CloseableIterator<Entry<KeyType>>()
+      return new CloseableIterator<>()
       {
         final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.size());
 
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunner.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunner.java
index be5110d4f7ff..7ff0258b9499 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunner.java
@@ -238,7 +238,7 @@ public CloseableGrouperIterator<RowBasedKey, ResultRow> make()
               List<ListenableFuture<AggregateResult>> futures = Lists.newArrayList(
                       Iterables.transform(
                           queryables,
-                          new Function<QueryRunner<ResultRow>, ListenableFuture<AggregateResult>>()
+                          new Function<>()
                           {
                             @Override
                             public ListenableFuture<AggregateResult> apply(final QueryRunner<ResultRow> input)
@@ -248,7 +248,7 @@ public ListenableFuture<AggregateResult> apply(final QueryRunner<ResultRow> inpu
                               }
 
                               ListenableFuture<AggregateResult> future = queryProcessingPool.submitRunnerTask(
-                                  new AbstractPrioritizedQueryRunnerCallable<AggregateResult, ResultRow>(priority, input)
+                                  new AbstractPrioritizedQueryRunnerCallable<>(priority, input)
                                   {
                                     @Override
                                     public AggregateResult call()
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByRowProcessor.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByRowProcessor.java
index 6d777426d35e..e2ca5c7e83b1 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByRowProcessor.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByRowProcessor.java
@@ -119,7 +119,7 @@ public static ResultSupplier process(
         subquery,
         querySpecificConfig,
         processingConfig,
-        new Supplier<ByteBuffer>()
+        new Supplier<>()
         {
           @Override
           public ByteBuffer get()
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/HashVectorGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/HashVectorGrouper.java
index e5c2801c3b74..dc1a9e599d70 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/HashVectorGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/HashVectorGrouper.java
@@ -219,7 +219,7 @@ public CloseableIterator<Grouper.Entry<MemoryPointer>> iterator()
 
     final IntIterator baseIterator = hashTable.bucketIterator();
 
-    return new CloseableIterator<Grouper.Entry<MemoryPointer>>()
+    return new CloseableIterator<>()
     {
       final MemoryPointer reusableKey = new MemoryPointer();
       final ReusableEntry<MemoryPointer> reusableEntry = new ReusableEntry<>(reusableKey, new Object[aggregators.size()]);
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/LimitedBufferHashGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/LimitedBufferHashGrouper.java
index 90a0e1e250d6..0627fba0333d 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/LimitedBufferHashGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/LimitedBufferHashGrouper.java
@@ -249,7 +249,7 @@ private CloseableIterator<Entry<KeyType>> makeDefaultOrderingIterator()
     final int size = offsetHeap.getHeapSize();
 
     @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
-    final List<Integer> wrappedOffsets = new AbstractList<Integer>()
+    final List<Integer> wrappedOffsets = new AbstractList<>()
     {
       @Override
       public Integer get(int index)
@@ -277,7 +277,7 @@ public int size()
     // Sort offsets in-place.
     Collections.sort(
         wrappedOffsets,
-        new Comparator<Integer>()
+        new Comparator<>()
         {
           @Override
           public int compare(Integer lhs, Integer rhs)
@@ -293,7 +293,7 @@ public int compare(Integer lhs, Integer rhs)
         }
     );
 
-    return new CloseableIterator<Entry<KeyType>>()
+    return new CloseableIterator<>()
     {
       final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.size());
       int curr = 0;
@@ -332,7 +332,7 @@ private CloseableIterator<Entry<KeyType>> makeHeapIterator()
     if (!hasIterated) {
       hasIterated = true;
       offsetHeapIterableSize = initialHeapSize;
-      return new CloseableIterator<Entry<KeyType>>()
+      return new CloseableIterator<>()
       {
         final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.size());
         int curr = 0;
@@ -372,7 +372,7 @@ public void close()
       };
     } else {
       // subsequent iterations just walk the buffer backwards
-      return new CloseableIterator<Entry<KeyType>>()
+      return new CloseableIterator<>()
       {
         final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.size());
         int curr = offsetHeapIterableSize - 1;
@@ -420,7 +420,7 @@ private void checkHeapAlreadyIterated()
 
   private Comparator<Integer> makeHeapComparator()
   {
-    return new Comparator<Integer>()
+    return new Comparator<>()
     {
       final BufferComparator bufferComparator = keySerde.bufferComparatorWithAggregators(
           aggregators.factories().toArray(new AggregatorFactory[0]),
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java
index 97ef49ece3a7..113c4c3c3176 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java
@@ -212,7 +212,7 @@ private static Supplier<ByteBuffer> createCombineBufferSupplier(
       int sliceSize
   )
   {
-    return new Supplier<ByteBuffer>()
+    return new Supplier<>()
     {
       private int i = 0;
 
@@ -473,7 +473,7 @@ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec)
     @Override
     public ColumnValueSelector<Object> makeColumnValueSelector(String columnName)
     {
-      return new ObjectBasedColumnSelector<Object>()
+      return new ObjectBasedColumnSelector<>()
       {
         @Override
         public void inspectRuntimeShape(RuntimeShapeInspector inspector)
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
index 063348f35b70..96e4e9d24380 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
@@ -379,7 +379,7 @@ public static ColumnSelectorFactory createResultRowBasedColumnSelectorFactory(
     final RowSignature signature = query.getResultRowSignature(finalization);
 
     final RowAdapter<ResultRow> adapter =
-        new RowAdapter<ResultRow>()
+        new RowAdapter<>()
         {
           @Override
           public ToLongFunction<ResultRow> timestampFunction()
@@ -1382,7 +1382,7 @@ public Grouper.BufferComparator bufferComparatorWithAggregators(
     public ObjectMapper decorateObjectMapper(ObjectMapper spillMapper)
     {
 
-      final JsonDeserializer<RowBasedKey> deserializer = new JsonDeserializer<RowBasedKey>()
+      final JsonDeserializer<RowBasedKey> deserializer = new JsonDeserializer<>()
       {
         @Override
         public RowBasedKey deserialize(
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java
index 0d422387cc37..fadcfa02c95d 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java
@@ -281,7 +281,7 @@ public CloseableIterator<Entry<KeyType>> iterator(final boolean sorted)
           CloseableIterators.withEmptyBaggage(
               Iterators.transform(
                   fileIterator,
-                  new Function<Entry<KeyType>, Entry<KeyType>>()
+                  new Function<>()
                   {
                     final ReusableEntry<KeyType> reusableEntry =
                         ReusableEntry.create(keySerde, aggregatorFactories.length);
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouper.java
index a4ad0c6348d2..c900f4c06278 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouper.java
@@ -383,7 +383,7 @@ public CloseableIterator<Entry<KeyType>> iterator()
       throw new ISE("Grouper should be initialized first");
     }
 
-    return new CloseableIterator<Entry<KeyType>>()
+    return new CloseableIterator<>()
     {
       final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.length);
 
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/vector/VectorGroupByEngine.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/vector/VectorGroupByEngine.java
index 78fa8e532a33..957a5f4189e8 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/vector/VectorGroupByEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/vector/VectorGroupByEngine.java
@@ -98,7 +98,7 @@ public CloseableIterator<ResultRow> make()
 
             if (cursor == null) {
               // Return empty iterator.
-              return new CloseableIterator<ResultRow>()
+              return new CloseableIterator<>()
               {
                 @Override
                 public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpec.java
index a34d58b6d140..db7a8f1f02d4 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpec.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpec.java
@@ -344,7 +344,7 @@ private Ordering<ResultRow> makeComparator(
     final Ordering<ResultRow> timeOrdering;
 
     if (hasTimestamp) {
-      timeOrdering = new Ordering<ResultRow>()
+      timeOrdering = new Ordering<>()
       {
         @Override
         public int compare(ResultRow left, ResultRow right)
@@ -468,7 +468,7 @@ private Ordering<ResultRow> dimensionOrdering(
                 DimensionHandlerUtils.coerceToStringArray(o2)
             );
           }
-          return new DimensionComparisonUtils.ArrayComparator<String>(stringComparator)
+          return new DimensionComparisonUtils.ArrayComparator<>(stringComparator)
               .compare(
                   DimensionHandlerUtils.coerceToStringArray(o1),
                   DimensionHandlerUtils.coerceToStringArray(o2)
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
index ac043d781c20..5dbe2abf94fc 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
@@ -122,7 +122,7 @@ public static List<OrderByColumnSpec> ascending(String... dimension)
   {
     return Lists.transform(
         Arrays.asList(dimension),
-        new Function<String, OrderByColumnSpec>()
+        new Function<>()
         {
           @Override
           public OrderByColumnSpec apply(@Nullable String input)
@@ -142,7 +142,7 @@ public static List<OrderByColumnSpec> descending(String... dimension)
   {
     return Lists.transform(
         Arrays.asList(dimension),
-        new Function<String, OrderByColumnSpec>()
+        new Function<>()
         {
           @Override
           public OrderByColumnSpec apply(@Nullable String input)
diff --git a/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java
index fa918af1c755..b1280fcfb04f 100644
--- a/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java
+++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java
@@ -46,7 +46,7 @@ public LookupExtractionFn(
   )
   {
     super(
-        new Function<String, String>()
+        new Function<>()
         {
           @Nullable
           @Override
diff --git a/processing/src/main/java/org/apache/druid/query/lookup/LookupSegment.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupSegment.java
index 4e841455b6be..58c64c47239d 100644
--- a/processing/src/main/java/org/apache/druid/query/lookup/LookupSegment.java
+++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupSegment.java
@@ -57,7 +57,7 @@ public LookupSegment(final String lookupName, final LookupExtractorFactory looku
 
           return extractor.asMap().entrySet().iterator();
         }),
-        new RowAdapter<Map.Entry<String, String>>()
+        new RowAdapter<>()
         {
           @Override
           public ToLongFunction<Map.Entry<String, String>> timestampFunction()
diff --git a/processing/src/main/java/org/apache/druid/query/lookup/LookupSnapshotTaker.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupSnapshotTaker.java
index 6111d99372ee..4cdd88973135 100644
--- a/processing/src/main/java/org/apache/druid/query/lookup/LookupSnapshotTaker.java
+++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupSnapshotTaker.java
@@ -69,7 +69,7 @@ public synchronized List<LookupBean> pullExistingSnapshot(final String tier)
         LOGGER.warn("found empty file no lookups to load from [%s]", persistFile.getAbsolutePath());
         return Collections.emptyList();
       }
-      lookupBeanList = objectMapper.readValue(persistFile, new TypeReference<List<LookupBean>>() {});
+      lookupBeanList = objectMapper.readValue(persistFile, new TypeReference<>() {});
       return lookupBeanList;
     }
     catch (IOException e) {
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java
index fd8d7e7009c9..23e583214c84 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java
@@ -76,9 +76,7 @@
 
 public class SegmentMetadataQueryQueryToolChest extends QueryToolChest<SegmentAnalysis, SegmentMetadataQuery>
 {
-  private static final TypeReference<SegmentAnalysis> TYPE_REFERENCE = new TypeReference<SegmentAnalysis>()
-  {
-  };
+  private static final TypeReference<SegmentAnalysis> TYPE_REFERENCE = new TypeReference<>() {};
   private static final byte SEGMENT_METADATA_CACHE_PREFIX = 0x4;
   private static final byte SEGMENT_METADATA_QUERY = 0x16;
   private static final Function<SegmentAnalysis, SegmentAnalysis> MERGE_TRANSFORM_FN =
@@ -106,7 +104,7 @@ public SegmentMetadataQueryQueryToolChest(
   @Override
   public QueryRunner<SegmentAnalysis> mergeResults(final QueryRunner<SegmentAnalysis> runner)
   {
-    return new BySegmentSkippingQueryRunner<SegmentAnalysis>(runner)
+    return new BySegmentSkippingQueryRunner<>(runner)
     {
       @Override
       public Sequence<SegmentAnalysis> doRun(
@@ -196,7 +194,7 @@ public CacheStrategy<SegmentAnalysis, SegmentAnalysis, SegmentMetadataQuery> get
       @Nullable final ObjectMapper objectMapper
   )
   {
-    return new CacheStrategy<SegmentAnalysis, SegmentAnalysis, SegmentMetadataQuery>()
+    return new CacheStrategy<>()
     {
       @Override
       public boolean isCacheable(SegmentMetadataQuery query, boolean willMergeRunners, boolean bySegment)
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java
index a2edb6638863..664b5d32bdce 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java
@@ -83,7 +83,7 @@ public SegmentMetadataQueryRunnerFactory(
   @Override
   public QueryRunner<SegmentAnalysis> createRunner(final Segment segment)
   {
-    return new QueryRunner<SegmentAnalysis>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<SegmentAnalysis> run(QueryPlus<SegmentAnalysis> inQ, ResponseContext responseContext)
@@ -190,15 +190,15 @@ public QueryRunner<SegmentAnalysis> mergeRunners(
       Iterable<QueryRunner<SegmentAnalysis>> queryRunners
   )
   {
-    return new ConcatQueryRunner<SegmentAnalysis>(
+    return new ConcatQueryRunner<>(
         Sequences.map(
             Sequences.simple(queryRunners),
-            new Function<QueryRunner<SegmentAnalysis>, QueryRunner<SegmentAnalysis>>()
+            new Function<>()
             {
               @Override
               public QueryRunner<SegmentAnalysis> apply(final QueryRunner<SegmentAnalysis> input)
               {
-                return new QueryRunner<SegmentAnalysis>()
+                return new QueryRunner<>()
                 {
                   @Override
                   public Sequence<SegmentAnalysis> run(
@@ -210,7 +210,7 @@ public Sequence<SegmentAnalysis> run(
                     final int priority = query.context().getPriority();
                     final QueryPlus<SegmentAnalysis> threadSafeQueryPlus = queryPlus.withoutThreadUnsafeState();
                     ListenableFuture<Sequence<SegmentAnalysis>> future = queryProcessingPool.submitRunnerTask(
-                        new AbstractPrioritizedQueryRunnerCallable<Sequence<SegmentAnalysis>, SegmentAnalysis>(priority, input)
+                        new AbstractPrioritizedQueryRunnerCallable<>(priority, input)
                         {
                           @Override
                           public Sequence<SegmentAnalysis> call()
@@ -239,7 +239,10 @@ public Sequence<SegmentAnalysis> call()
                     catch (TimeoutException e) {
                       log.info("Query timeout, cancelling pending results for query id [%s]", query.getId());
                       future.cancel(true);
-                      throw new QueryTimeoutException(StringUtils.nonStrictFormat("Query [%s] timed out", query.getId()));
+                      throw new QueryTimeoutException(StringUtils.nonStrictFormat(
+                          "Query [%s] timed out",
+                          query.getId()
+                      ));
                     }
                     catch (ExecutionException e) {
                       throw new RuntimeException(e);
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
index d157ee8c1a1a..131920177d38 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
@@ -38,7 +38,7 @@ public class ColumnAnalysis
 
   public static <T> Builder<T> builder()
   {
-    return new Builder<T>();
+    return new Builder<>();
   }
 
   public static ColumnAnalysis error(String reason)
diff --git a/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationService.java b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationService.java
index c04f4b1dc5df..f866a9fb9a34 100644
--- a/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationService.java
+++ b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationService.java
@@ -93,7 +93,7 @@ public final class SpecializationService
   private static final AtomicLong SPECIALIZED_CLASS_COUNTER = new AtomicLong();
 
   private static final ClassValue<PerPrototypeClassState> PER_PROTOTYPE_CLASS_STATE =
-      new ClassValue<PerPrototypeClassState>()
+      new ClassValue<>()
       {
         @Override
         protected PerPrototypeClassState computeValue(Class<?> type)
diff --git a/processing/src/main/java/org/apache/druid/query/operator/OperatorSequence.java b/processing/src/main/java/org/apache/druid/query/operator/OperatorSequence.java
index 9bb90189cdb2..c5376d577351 100644
--- a/processing/src/main/java/org/apache/druid/query/operator/OperatorSequence.java
+++ b/processing/src/main/java/org/apache/druid/query/operator/OperatorSequence.java
@@ -52,7 +52,7 @@ public <OutType> OutType accumulate(
   {
     final MyReceiver<OutType> receiver = new MyReceiver<>(
         initValue,
-        new YieldingAccumulator<OutType, RowsAndColumns>()
+        new YieldingAccumulator<>()
         {
           @Override
           public OutType accumulate(OutType accumulated, RowsAndColumns in)
@@ -78,7 +78,7 @@ public <OutType> Yielder<OutType> toYielder(
       // We finished processing, and the accumulator did not yield, so we return a done yielder with our value
       return Yielders.done(receiver.getRetVal(), null);
     } else {
-      return new Yielder<OutType>()
+      return new Yielder<>()
       {
         private Closeable continuation = finalContinuation;
 
diff --git a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryRunnerFactory.java
index f86f91be18be..22688f9dc2be 100644
--- a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryRunnerFactory.java
@@ -91,7 +91,7 @@ public Sequence<RowsAndColumns> apply(
               {
                 return Sequences.map(
                     input.run(queryPlus, responseContext),
-                    new Function<RowsAndColumns, RowsAndColumns>()
+                    new Function<>()
                     {
                       @Nullable
                       @Override
diff --git a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryToolChest.java
index 7fb67e8732db..e5c115fd2d75 100644
--- a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryToolChest.java
@@ -100,9 +100,7 @@ public Function<RowsAndColumns, RowsAndColumns> makePreComputeManipulatorFn(
   @Override
   public TypeReference<RowsAndColumns> getResultTypeReference()
   {
-    return new TypeReference<RowsAndColumns>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/query/rowsandcols/semantic/DefaultFramedOnHeapAggregatable.java b/processing/src/main/java/org/apache/druid/query/rowsandcols/semantic/DefaultFramedOnHeapAggregatable.java
index 7130fafd8671..7520f6ea0ab3 100644
--- a/processing/src/main/java/org/apache/druid/query/rowsandcols/semantic/DefaultFramedOnHeapAggregatable.java
+++ b/processing/src/main/java/org/apache/druid/query/rowsandcols/semantic/DefaultFramedOnHeapAggregatable.java
@@ -176,7 +176,7 @@ public GroupIteratorForWindowFrame(WindowFrame.OffsetFrame frame, int[] groupBou
     @Override
     public Iterator<AggInterval> iterator()
     {
-      return new Iterator<AggInterval>()
+      return new Iterator<>()
       {
         int currentGroupIndex = 0;
 
@@ -270,7 +270,7 @@ public Interval(int a, int b)
     @Override
     public Iterator<Integer> iterator()
     {
-      return new Iterator<Integer>()
+      return new Iterator<>()
       {
         int current = a;
 
diff --git a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java
index 0286b7b9886f..7d314e972c62 100644
--- a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java
@@ -156,7 +156,7 @@ public Iterator<ScanResultValue> make()
             }
 
             final int batchSize = query.getBatchSize();
-            return new Iterator<ScanResultValue>()
+            return new Iterator<>()
             {
               private long offset = 0;
 
diff --git a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryLimitRowIterator.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryLimitRowIterator.java
index 45cd4c2624c0..4d69062dc20e 100644
--- a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryLimitRowIterator.java
+++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryLimitRowIterator.java
@@ -73,7 +73,7 @@ public class ScanQueryLimitRowIterator implements CloseableIterator<ScanResultVa
     Sequence<ScanResultValue> baseSequence = baseRunner.run(QueryPlus.wrap(historicalQuery), responseContext);
     this.yielder = baseSequence.toYielder(
         null,
-        new YieldingAccumulator<ScanResultValue, ScanResultValue>()
+        new YieldingAccumulator<>()
         {
           @Override
           public ScanResultValue accumulate(ScanResultValue accumulated, ScanResultValue in)
diff --git a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryOffsetSequence.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryOffsetSequence.java
index 57bf6672d702..5ef69934795e 100644
--- a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryOffsetSequence.java
+++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryOffsetSequence.java
@@ -64,7 +64,7 @@ private <OutType> Yielder<OutType> wrapYielder(
       final SkippingYieldingAccumulator<OutType> accumulator
   )
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java
index 717a40d1062e..57bbe6a49429 100644
--- a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java
@@ -46,9 +46,7 @@
 
 public class ScanQueryQueryToolChest extends QueryToolChest<ScanResultValue, ScanQuery>
 {
-  private static final TypeReference<ScanResultValue> TYPE_REFERENCE = new TypeReference<ScanResultValue>()
-  {
-  };
+  private static final TypeReference<ScanResultValue> TYPE_REFERENCE = new TypeReference<>() {};
 
   private final GenericQueryMetricsFactory queryMetricsFactory;
 
diff --git a/processing/src/main/java/org/apache/druid/query/search/SearchQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/search/SearchQueryQueryToolChest.java
index 3519de9b2f82..fba270cdcc69 100644
--- a/processing/src/main/java/org/apache/druid/query/search/SearchQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/search/SearchQueryQueryToolChest.java
@@ -59,12 +59,8 @@
 public class SearchQueryQueryToolChest extends QueryToolChest<Result<SearchResultValue>, SearchQuery>
 {
   private static final byte SEARCH_QUERY = 0x15;
-  private static final TypeReference<Result<SearchResultValue>> TYPE_REFERENCE = new TypeReference<Result<SearchResultValue>>()
-  {
-  };
-  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<Object>()
-  {
-  };
+  private static final TypeReference<Result<SearchResultValue>> TYPE_REFERENCE = new TypeReference<>() {};
+  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<>() {};
 
   private final SearchQueryConfig config;
   private final SearchQueryMetricsFactory queryMetricsFactory;
@@ -136,7 +132,7 @@ public CacheStrategy<Result<SearchResultValue>, Object, SearchQuery> getCacheStr
   )
   {
 
-    return new CacheStrategy<Result<SearchResultValue>, Object, SearchQuery>()
+    return new CacheStrategy<>()
     {
       private final List<DimensionSpec> dimensionSpecs =
           query.getDimensions() != null ? query.getDimensions() : Collections.emptyList();
@@ -179,7 +175,7 @@ public TypeReference<Object> getCacheObjectClazz()
       @Override
       public Function<Result<SearchResultValue>, Object> prepareForCache(boolean isResultLevelCache)
       {
-        return new Function<Result<SearchResultValue>, Object>()
+        return new Function<>()
         {
           @Override
           public Object apply(Result<SearchResultValue> input)
@@ -194,7 +190,7 @@ public Object apply(Result<SearchResultValue> input)
       @Override
       public Function<Object, Result<SearchResultValue>> pullFromCache(boolean isResultLevelCache)
       {
-        return new Function<Object, Result<SearchResultValue>>()
+        return new Function<>()
         {
           @Override
           @SuppressWarnings("unchecked")
@@ -342,7 +338,7 @@ public Sequence<Result<SearchResultValue>> run(
 
       return Sequences.map(
           runner.run(queryPlus.withQuery(query.withLimit(config.getMaxSearchLimit())), responseContext),
-          new Function<Result<SearchResultValue>, Result<SearchResultValue>>()
+          new Function<>()
           {
             @Override
             public Result<SearchResultValue> apply(Result<SearchResultValue> input)
@@ -350,17 +346,17 @@ public Result<SearchResultValue> apply(Result<SearchResultValue> input)
               if (isBySegment) {
                 BySegmentSearchResultValue value = (BySegmentSearchResultValue) input.getValue();
 
-                return new Result<SearchResultValue>(
+                return new Result<>(
                     input.getTimestamp(),
                     new BySegmentSearchResultValue(
                         Lists.transform(
                             value.getResults(),
-                            new Function<Result<SearchResultValue>, Result<SearchResultValue>>()
+                            new Function<>()
                             {
                               @Override
                               public Result<SearchResultValue> apply(@Nullable Result<SearchResultValue> input)
                               {
-                                return new Result<SearchResultValue>(
+                                return new Result<>(
                                     input.getTimestamp(),
                                     new SearchResultValue(
                                         Lists.newArrayList(
@@ -380,7 +376,7 @@ public Result<SearchResultValue> apply(@Nullable Result<SearchResultValue> input
                 );
               }
 
-              return new Result<SearchResultValue>(
+              return new Result<>(
                   input.getTimestamp(),
                   new SearchResultValue(
                       Lists.newArrayList(
diff --git a/processing/src/main/java/org/apache/druid/query/search/SearchSortSpec.java b/processing/src/main/java/org/apache/druid/query/search/SearchSortSpec.java
index e97414a7c361..09f590bd7cbe 100644
--- a/processing/src/main/java/org/apache/druid/query/search/SearchSortSpec.java
+++ b/processing/src/main/java/org/apache/druid/query/search/SearchSortSpec.java
@@ -50,7 +50,7 @@ public StringComparator getOrdering()
 
   public Comparator<SearchHit> getComparator()
   {
-    return new Comparator<SearchHit>()
+    return new Comparator<>()
     {
       @Override
       public int compare(SearchHit searchHit, SearchHit searchHit1)
diff --git a/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentQueryRunner.java b/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentQueryRunner.java
index 60c5891afafc..7f1a37f61e63 100644
--- a/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentQueryRunner.java
@@ -89,7 +89,7 @@ public Sequence<T> run(final QueryPlus<T> input, final ResponseContext responseC
       baseSequence = base.run(queryPlus, responseContext);
     }
 
-    Sequence<T> segmentMissingCatchingSequence = new Sequence<T>()
+    Sequence<T> segmentMissingCatchingSequence = new Sequence<>()
     {
       @Override
       public <OutType> OutType accumulate(final OutType initValue, final Accumulator<OutType, T> accumulator)
@@ -120,7 +120,7 @@ public <OutType> Yielder<OutType> toYielder(
 
       private <OutType> Yielder<OutType> makeYielder(final Yielder<OutType> yielder)
       {
-        return new Yielder<OutType>()
+        return new Yielder<>()
         {
           @Override
           public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java
index eab5e0f5abcf..ffa31c3cea6b 100644
--- a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java
@@ -62,12 +62,8 @@ public class TimeBoundaryQueryQueryToolChest
 {
   private static final byte TIMEBOUNDARY_QUERY = 0x3;
 
-  private static final TypeReference<Result<TimeBoundaryResultValue>> TYPE_REFERENCE = new TypeReference<Result<TimeBoundaryResultValue>>()
-  {
-  };
-  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<Object>()
-  {
-  };
+  private static final TypeReference<Result<TimeBoundaryResultValue>> TYPE_REFERENCE = new TypeReference<>() {};
+  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<>() {};
 
   private final GenericQueryMetricsFactory queryMetricsFactory;
 
@@ -104,7 +100,7 @@ public QueryRunner<Result<TimeBoundaryResultValue>> mergeResults(
       final QueryRunner<Result<TimeBoundaryResultValue>> runner
   )
   {
-    return new BySegmentSkippingQueryRunner<Result<TimeBoundaryResultValue>>(runner)
+    return new BySegmentSkippingQueryRunner<>(runner)
     {
       @Override
       protected Sequence<Result<TimeBoundaryResultValue>> doRun(
@@ -176,7 +172,7 @@ public CacheStrategy<Result<TimeBoundaryResultValue>, Object, TimeBoundaryQuery>
       @Nullable final ObjectMapper objectMapper
   )
   {
-    return new CacheStrategy<Result<TimeBoundaryResultValue>, Object, TimeBoundaryQuery>()
+    return new CacheStrategy<>()
     {
       @Override
       public boolean isCacheable(TimeBoundaryQuery query, boolean willMergeRunners, boolean bySegment)
@@ -209,7 +205,7 @@ public TypeReference<Object> getCacheObjectClazz()
       @Override
       public Function<Result<TimeBoundaryResultValue>, Object> prepareForCache(boolean isResultLevelCache)
       {
-        return new Function<Result<TimeBoundaryResultValue>, Object>()
+        return new Function<>()
         {
           @Override
           public Object apply(Result<TimeBoundaryResultValue> input)
@@ -222,7 +218,7 @@ public Object apply(Result<TimeBoundaryResultValue> input)
       @Override
       public Function<Object, Result<TimeBoundaryResultValue>> pullFromCache(boolean isResultLevelCache)
       {
-        return new Function<Object, Result<TimeBoundaryResultValue>>()
+        return new Function<>()
         {
           @Override
           @SuppressWarnings("unchecked")
diff --git a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java
index a5d8fa027d43..3f84da545c98 100644
--- a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java
@@ -120,7 +120,7 @@ public Sequence<Result<TimeBoundaryResultValue>> run(
       final TimeBoundaryQuery query = (TimeBoundaryQuery) input;
 
       return new BaseSequence<>(
-          new BaseSequence.IteratorMaker<Result<TimeBoundaryResultValue>, Iterator<Result<TimeBoundaryResultValue>>>()
+          new BaseSequence.IteratorMaker<>()
           {
             @Override
             public Iterator<Result<TimeBoundaryResultValue>> make()
diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesBinaryFn.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesBinaryFn.java
index 6436e3df7862..5fb6db169b6a 100644
--- a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesBinaryFn.java
+++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesBinaryFn.java
@@ -59,7 +59,7 @@ public Result<TimeseriesResultValue> apply(Result<TimeseriesResultValue> arg1, R
     TimeseriesResultValue arg1Val = arg1.getValue();
     TimeseriesResultValue arg2Val = arg2.getValue();
 
-    Map<String, Object> retVal = new LinkedHashMap<String, Object>();
+    Map<String, Object> retVal = new LinkedHashMap<>();
 
     for (AggregatorFactory factory : aggregations) {
       final String metricName = factory.getName();
@@ -67,11 +67,11 @@ public Result<TimeseriesResultValue> apply(Result<TimeseriesResultValue> arg1, R
     }
 
     return (gran instanceof AllGranularity) ?
-           new Result<TimeseriesResultValue>(
+           new Result<>(
                arg1.getTimestamp(),
                new TimeseriesResultValue(retVal)
            ) :
-           new Result<TimeseriesResultValue>(
+           new Result<>(
                gran.bucketStart(arg1.getTimestamp()),
                new TimeseriesResultValue(retVal)
            );
diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java
index acaf1427ce32..91fddf49eefa 100644
--- a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java
@@ -84,13 +84,9 @@ public class TimeseriesQueryQueryToolChest extends QueryToolChest<Result<Timeser
 {
   private static final byte TIMESERIES_QUERY = 0x0;
   private static final TypeReference<Object> OBJECT_TYPE_REFERENCE =
-      new TypeReference<Object>()
-      {
-      };
+      new TypeReference<>() {};
   private static final TypeReference<Result<TimeseriesResultValue>> TYPE_REFERENCE =
-      new TypeReference<Result<TimeseriesResultValue>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private final TimeseriesQueryMetricsFactory queryMetricsFactory;
 
@@ -111,7 +107,7 @@ public QueryRunner<Result<TimeseriesResultValue>> mergeResults(
       QueryRunner<Result<TimeseriesResultValue>> queryRunner
   )
   {
-    final QueryRunner<Result<TimeseriesResultValue>> resultMergeQueryRunner = new ResultMergeQueryRunner<Result<TimeseriesResultValue>>(
+    final QueryRunner<Result<TimeseriesResultValue>> resultMergeQueryRunner = new ResultMergeQueryRunner<>(
         queryRunner,
         this::createResultComparator,
         this::createMergeFn
@@ -288,7 +284,7 @@ public CacheStrategy<Result<TimeseriesResultValue>, Object, TimeseriesQuery> get
       @Nullable final ObjectMapper objectMapper
   )
   {
-    return new CacheStrategy<Result<TimeseriesResultValue>, Object, TimeseriesQuery>()
+    return new CacheStrategy<>()
     {
       private final List<AggregatorFactory> aggs = query.getAggregatorSpecs();
 
@@ -363,7 +359,7 @@ public Function<Result<TimeseriesResultValue>, Object> prepareForCache(boolean i
       @Override
       public Function<Object, Result<TimeseriesResultValue>> pullFromCache(boolean isResultLevelCache)
       {
-        return new Function<Object, Result<TimeseriesResultValue>>()
+        return new Function<>()
         {
           private final Granularity granularity = query.getGranularity();
 
diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultBuilder.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultBuilder.java
index 2332f53c7b45..efb4218297e4 100644
--- a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultBuilder.java
+++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultBuilder.java
@@ -31,7 +31,7 @@ public class TimeseriesResultBuilder
 {
   private final DateTime timestamp;
 
-  private final Map<String, Object> metricValues = new HashMap<String, Object>();
+  private final Map<String, Object> metricValues = new HashMap<>();
 
   public TimeseriesResultBuilder(
       DateTime timestamp
diff --git a/processing/src/main/java/org/apache/druid/query/topn/NumericTopNMetricSpec.java b/processing/src/main/java/org/apache/druid/query/topn/NumericTopNMetricSpec.java
index 878c010e3b03..5559f5d8d43a 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/NumericTopNMetricSpec.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/NumericTopNMetricSpec.java
@@ -62,7 +62,7 @@ public void verifyPreconditions(List<AggregatorFactory> aggregatorSpecs, List<Po
 
     final AggregatorFactory aggregator = Iterables.tryFind(
         aggregatorSpecs,
-        new Predicate<AggregatorFactory>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(AggregatorFactory input)
@@ -74,7 +74,7 @@ public boolean apply(AggregatorFactory input)
 
     final PostAggregator postAggregator = Iterables.tryFind(
         postAggregatorSpecs,
-        new Predicate<PostAggregator>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(PostAggregator input)
diff --git a/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
index d2ba16746218..cb704213b8a4 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
@@ -231,7 +231,7 @@ public PooledTopNParams makeInitParams(ColumnSelectorPlus selectorPlus, Cursor c
       throw new UnsupportedOperationException("Cannot operate on a dimension with no dictionary");
     }
 
-    final TopNMetricSpecBuilder<int[]> arrayProvider = new BaseArrayProvider<int[]>(dimSelector, query, cursorInspector)
+    final TopNMetricSpecBuilder<int[]> arrayProvider = new BaseArrayProvider<>(dimSelector, query, cursorInspector)
     {
       private final int[] positions = new int[cardinality];
 
diff --git a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryQueryToolChest.java
index 5500230f04c3..f0d5fa586718 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryQueryToolChest.java
@@ -80,12 +80,8 @@
 public class TopNQueryQueryToolChest extends QueryToolChest<Result<TopNResultValue>, TopNQuery>
 {
   private static final byte TOPN_QUERY = 0x1;
-  private static final TypeReference<Result<TopNResultValue>> TYPE_REFERENCE = new TypeReference<Result<TopNResultValue>>()
-  {
-  };
-  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<Object>()
-  {
-  };
+  private static final TypeReference<Result<TopNResultValue>> TYPE_REFERENCE = new TypeReference<>() {};
+  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<>() {};
 
   private final TopNQueryConfig config;
   private final TopNQueryMetricsFactory queryMetricsFactory;
@@ -192,7 +188,7 @@ public Function<Result<TopNResultValue>, Result<TopNResultValue>> makePreCompute
       throw DruidException.defensive("This method can only be used to deserialize.");
     }
 
-    return new Function<Result<TopNResultValue>, Result<TopNResultValue>>()
+    return new Function<>()
     {
       private final AggregatorFactory[] aggregatorFactories = query.getAggregatorSpecs()
                                                                    .toArray(new AggregatorFactory[0]);
@@ -232,7 +228,7 @@ public Function<Result<TopNResultValue>, Result<TopNResultValue>> makePostComput
     }
 
     if (MetricManipulatorFns.finalizing() == fn) {
-      return new Function<Result<TopNResultValue>, Result<TopNResultValue>>()
+      return new Function<>()
       {
         private final AggregatorFactory[] aggregatorFactories = query.getAggregatorSpecs()
                                                                      .toArray(new AggregatorFactory[0]);
@@ -282,7 +278,7 @@ public CacheStrategy<Result<TopNResultValue>, Object, TopNQuery> getCacheStrateg
       @Nullable final ObjectMapper objectMapper
   )
   {
-    return new CacheStrategy<Result<TopNResultValue>, Object, TopNQuery>()
+    return new CacheStrategy<>()
     {
       private final List<AggregatorFactory> aggs = Lists.newArrayList(query.getAggregatorSpecs());
       private final List<PostAggregator> postAggs = AggregatorUtil.pruneDependentPostAgg(
@@ -342,7 +338,7 @@ public TypeReference<Object> getCacheObjectClazz()
       @Override
       public Function<Result<TopNResultValue>, Object> prepareForCache(boolean isResultLevelCache)
       {
-        return new Function<Result<TopNResultValue>, Object>()
+        return new Function<>()
         {
           private final String[] aggFactoryNames = extractFactoryName(query.getAggregatorSpecs());
 
@@ -375,7 +371,7 @@ public Object apply(final Result<TopNResultValue> input)
       @Override
       public Function<Object, Result<TopNResultValue>> pullFromCache(boolean isResultLevelCache)
       {
-        return new Function<Object, Result<TopNResultValue>>()
+        return new Function<>()
         {
           private final Granularity granularity = query.getGranularity();
 
@@ -458,7 +454,7 @@ public QueryRunner<Result<TopNResultValue>> postMergeQueryDecoration(final Query
         runner,
         config
     );
-    return new QueryRunner<Result<TopNResultValue>>()
+    return new QueryRunner<>()
     {
 
       @Override
@@ -474,14 +470,14 @@ public Sequence<Result<TopNResultValue>> run(
         } else {
           return Sequences.map(
               resultSequence,
-              new Function<Result<TopNResultValue>, Result<TopNResultValue>>()
+              new Function<>()
               {
                 @Override
                 public Result<TopNResultValue> apply(Result<TopNResultValue> input)
                 {
                   TopNResultValue resultValue = input.getValue();
 
-                  return new Result<TopNResultValue>(
+                  return new Result<>(
                       input.getTimestamp(),
                       TopNResultValue.create(
                           Lists.transform(
@@ -642,7 +638,7 @@ public Sequence<Result<TopNResultValue>> run(
 
       return Sequences.map(
           runner.run(queryPlus.withQuery(query.withThreshold(minTopNThreshold)), responseContext),
-          new Function<Result<TopNResultValue>, Result<TopNResultValue>>()
+          new Function<>()
           {
             @Override
             public Result<TopNResultValue> apply(Result<TopNResultValue> input)
@@ -656,7 +652,7 @@ public Result<TopNResultValue> apply(Result<TopNResultValue> input)
                     new BySegmentTopNResultValue(
                         Lists.transform(
                             value.getResults(),
-                            new Function<Result<TopNResultValue>, Result<TopNResultValue>>()
+                            new Function<>()
                             {
                               @Override
                               public Result<TopNResultValue> apply(Result<TopNResultValue> input)
diff --git a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryRunnerFactory.java
index 0229bdbcc592..f813a2b885ea 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryRunnerFactory.java
@@ -62,7 +62,7 @@ public TopNQueryRunnerFactory(
   public QueryRunner<Result<TopNResultValue>> createRunner(final Segment segment)
   {
     final TopNQueryEngine queryEngine = new TopNQueryEngine(computationBufferPool);
-    return new QueryRunner<Result<TopNResultValue>>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<Result<TopNResultValue>> run(
diff --git a/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java b/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
index d0209b0bfea8..dafd7dc96005 100644
--- a/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
@@ -361,7 +361,7 @@ public ColumnValueSelector<?> makeColumnValueSelector(
       return rootLiteralSelector;
     }
 
-    return new ColumnValueSelector<Object>()
+    return new ColumnValueSelector<>()
     {
       @Override
       public double getDouble()
@@ -593,7 +593,7 @@ private ColumnValueSelector<?> getRootLiteralValueSelector(
       return null;
     }
     final Object defaultValue = getDefaultValueForType(getLogicalType());
-    return new ColumnValueSelector<Object>()
+    return new ColumnValueSelector<>()
     {
       @Override
       public boolean isNull()
diff --git a/processing/src/main/java/org/apache/druid/segment/ComparatorDimensionDictionary.java b/processing/src/main/java/org/apache/druid/segment/ComparatorDimensionDictionary.java
index 41b793ae07c6..b8d1e1f47a14 100644
--- a/processing/src/main/java/org/apache/druid/segment/ComparatorDimensionDictionary.java
+++ b/processing/src/main/java/org/apache/druid/segment/ComparatorDimensionDictionary.java
@@ -140,7 +140,7 @@ public int getIdForNull()
 
   public ComparatorSortedDimensionDictionary<T> sort()
   {
-    return new ComparatorSortedDimensionDictionary<T>(idToValue, comparator, idToValue.size());
+    return new ComparatorSortedDimensionDictionary<>(idToValue, comparator, idToValue.size());
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/segment/CompressedPools.java b/processing/src/main/java/org/apache/druid/segment/CompressedPools.java
index 449a25f7c166..eef78a901f1f 100644
--- a/processing/src/main/java/org/apache/druid/segment/CompressedPools.java
+++ b/processing/src/main/java/org/apache/druid/segment/CompressedPools.java
@@ -36,7 +36,7 @@ public class CompressedPools
   public static final int BUFFER_SIZE = 0x10000;
   private static final StupidPool<BufferRecycler> BUFFER_RECYCLER_POOL = new StupidPool<>(
       "bufferRecyclerPool",
-      new Supplier<BufferRecycler>()
+      new Supplier<>()
       {
         private final AtomicLong counter = new AtomicLong(0);
 
@@ -54,9 +54,9 @@ public static ResourceHolder<BufferRecycler> getBufferRecycler()
     return BUFFER_RECYCLER_POOL.take();
   }
 
-  private static final StupidPool<byte[]> OUTPUT_BYTES_POOL = new StupidPool<byte[]>(
+  private static final StupidPool<byte[]> OUTPUT_BYTES_POOL = new StupidPool<>(
       "outputBytesPool",
-      new Supplier<byte[]>()
+      new Supplier<>()
       {
         private final AtomicLong counter = new AtomicLong(0);
 
@@ -74,9 +74,9 @@ public static ResourceHolder<byte[]> getOutputBytes()
     return OUTPUT_BYTES_POOL.take();
   }
 
-  private static final StupidPool<ByteBuffer> BIG_ENDIAN_BYTE_BUF_POOL = new StupidPool<ByteBuffer>(
+  private static final StupidPool<ByteBuffer> BIG_ENDIAN_BYTE_BUF_POOL = new StupidPool<>(
       "bigEndByteBufPool",
-      new Supplier<ByteBuffer>()
+      new Supplier<>()
       {
         private final AtomicLong counter = new AtomicLong(0);
 
@@ -91,7 +91,7 @@ public ByteBuffer get()
 
   private static final StupidPool<ByteBuffer> LITTLE_ENDIAN_BYTE_BUF_POOL = new StupidPool<>(
       "littleEndByteBufPool",
-      new Supplier<ByteBuffer>()
+      new Supplier<>()
       {
         private final AtomicLong counter = new AtomicLong(0);
 
diff --git a/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java b/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java
index 9a4d41ca10bf..af77db50cc64 100644
--- a/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java
@@ -78,7 +78,7 @@ public Integer getUnsortedEncodedValueFromSorted(Integer sortedIntermediateValue
   @Override
   public CloseableIndexed<ActualType> getSortedIndexedValues()
   {
-    return new CloseableIndexed<ActualType>()
+    return new CloseableIndexed<>()
     {
       @Override
       public int size()
diff --git a/processing/src/main/java/org/apache/druid/segment/IndexSpec.java b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
index 1dc2f8496821..cf9527f43342 100644
--- a/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
+++ b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
@@ -169,9 +169,7 @@ public Map<String, Object> asMap(ObjectMapper objectMapper)
   {
     return objectMapper.convertValue(
         this,
-        new TypeReference<Map<String, Object>>()
-        {
-        }
+        new TypeReference<>() {}
     );
   }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java b/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
index f3c92806e4fc..366f5d86278d 100644
--- a/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
+++ b/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
@@ -386,7 +386,7 @@ private ColumnValueSelector<?> getRootLiteralValueSelector(
     if (root == null || !root.isSingleType()) {
       return null;
     }
-    return new ColumnValueSelector<Object>()
+    return new ColumnValueSelector<>()
     {
       @Override
       public boolean isNull()
diff --git a/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java b/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java
index fdec3477cd81..a6dac64981fd 100644
--- a/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java
+++ b/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java
@@ -172,7 +172,7 @@ public <T extends Comparable<? super T>> CloseableIndexed<T> getDimValueLookup(S
     @SuppressWarnings("unchecked")
     DictionaryEncodedColumn<T> dict = (DictionaryEncodedColumn<T>) col;
 
-    return new CloseableIndexed<T>()
+    return new CloseableIndexed<>()
     {
 
       @Override
diff --git a/processing/src/main/java/org/apache/druid/segment/RowAdapters.java b/processing/src/main/java/org/apache/druid/segment/RowAdapters.java
index 22abf5da2af4..5f906f5f9fc3 100644
--- a/processing/src/main/java/org/apache/druid/segment/RowAdapters.java
+++ b/processing/src/main/java/org/apache/druid/segment/RowAdapters.java
@@ -29,7 +29,7 @@
  */
 public class RowAdapters
 {
-  private static final RowAdapter<? extends Row> STANDARD_ROW_ADAPTER = new RowAdapter<Row>()
+  private static final RowAdapter<? extends Row> STANDARD_ROW_ADAPTER = new RowAdapter<>()
   {
     @Override
     public ToLongFunction<Row> timestampFunction()
diff --git a/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java b/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
index 43ae6ae14646..035e036f153f 100644
--- a/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
@@ -448,7 +448,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
       final ValueType numberType =
           capabilities != null && capabilities.getType().isNumeric() ? capabilities.getType() : null;
 
-      return new ColumnValueSelector<Object>()
+      return new ColumnValueSelector<>()
       {
         private long currentValueId = RowIdSupplier.INIT;
         private long currentValueAsNumberId = RowIdSupplier.INIT;
diff --git a/processing/src/main/java/org/apache/druid/segment/column/RowSignature.java b/processing/src/main/java/org/apache/druid/segment/column/RowSignature.java
index 7ee2eb2575e5..3c7b3a98a816 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/RowSignature.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/RowSignature.java
@@ -416,7 +416,7 @@ public RowSignature buildSafeSignature(ImmutableList<String> requestedColumnName
    */
   public List<ColumnType> getColumnTypes()
   {
-    List<ColumnType> ret = new ArrayList<ColumnType>();
+    List<ColumnType> ret = new ArrayList<>();
     for (String colName : columnNames) {
       ret.add(columnTypes.get(colName));
     }
diff --git a/processing/src/main/java/org/apache/druid/segment/column/StringEncodingStrategies.java b/processing/src/main/java/org/apache/druid/segment/column/StringEncodingStrategies.java
index bf95f1ed70c1..be41cb5f0215 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/StringEncodingStrategies.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/StringEncodingStrategies.java
@@ -140,7 +140,7 @@ public int indexOf(@Nullable String value)
     public Iterator<String> iterator()
     {
       final Iterator<ByteBuffer> delegateIterator = delegate.iterator();
-      return new Iterator<String>()
+      return new Iterator<>()
       {
         @Override
         public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplier.java
index 88e78f798087..22b477c019cc 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplier.java
@@ -173,12 +173,12 @@ static CompressedColumnarIntsSupplier fromIntBuffer(
         buffer.remaining(),
         chunkFactor,
         GenericIndexed.ofCompressedByteBuffers(
-            new Iterable<ByteBuffer>()
+            new Iterable<>()
             {
               @Override
               public Iterator<ByteBuffer> iterator()
               {
-                return new Iterator<ByteBuffer>()
+                return new Iterator<>()
                 {
                   final IntBuffer myBuffer = buffer.asReadOnlyBuffer();
                   final ByteBuffer retVal = compression
@@ -241,12 +241,12 @@ public static CompressedColumnarIntsSupplier fromList(
         list.size(),
         chunkFactor,
         GenericIndexed.ofCompressedByteBuffers(
-            new Iterable<ByteBuffer>()
+            new Iterable<>()
             {
               @Override
               public Iterator<ByteBuffer> iterator()
               {
-                return new Iterator<ByteBuffer>()
+                return new Iterator<>()
                 {
                   private final ByteBuffer retVal = compression
                       .getCompressor()
diff --git a/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java
index dfa6667bf01f..b02f4fd6c88b 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java
@@ -219,12 +219,12 @@ public static CompressedVSizeColumnarIntsSupplier fromList(
         chunkFactor,
         numBytes,
         GenericIndexed.ofCompressedByteBuffers(
-            new Iterable<ByteBuffer>()
+            new Iterable<>()
             {
               @Override
               public Iterator<ByteBuffer> iterator()
               {
-                return new Iterator<ByteBuffer>()
+                return new Iterator<>()
                 {
                   int position = 0;
                   private final ByteBuffer retVal =
diff --git a/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java b/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
index 9e7d2ea5b616..55d4c2d1f883 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
@@ -270,7 +270,7 @@ static <T> MetaSerdeHelper.FieldWriter<T> longEncodingWriter(
       Function<T, CompressionStrategy> getCompressionStrategy
   )
   {
-    return new MetaSerdeHelper.FieldWriter<T>()
+    return new MetaSerdeHelper.FieldWriter<>()
     {
       @Override
       public void writeTo(ByteBuffer buffer, T x)
diff --git a/processing/src/main/java/org/apache/druid/segment/data/DecompressingByteBufferObjectStrategy.java b/processing/src/main/java/org/apache/druid/segment/data/DecompressingByteBufferObjectStrategy.java
index 72db63b1a190..b2e44587c057 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/DecompressingByteBufferObjectStrategy.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/DecompressingByteBufferObjectStrategy.java
@@ -75,7 +75,7 @@ public ResourceHolder<ByteBuffer> fromByteBuffer(ByteBuffer buffer, int numBytes
     // Needed, because if e. g. if this compressed buffer contains 3-byte integers, it should be possible to getInt()
     // from the buffer, including padding. See CompressedVSizeColumnarIntsSupplier.bufferPadding().
     buf.limit(buf.capacity());
-    return new ResourceHolder<ByteBuffer>()
+    return new ResourceHolder<>()
     {
       @Override
       public ByteBuffer get()
diff --git a/processing/src/main/java/org/apache/druid/segment/data/FixedIndexedWriter.java b/processing/src/main/java/org/apache/druid/segment/data/FixedIndexedWriter.java
index 42ca16b78f42..c93b1ecc730b 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/FixedIndexedWriter.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/FixedIndexedWriter.java
@@ -174,9 +174,10 @@ public Iterator<T> getIterator()
     final int totalCount = cardinality;
 
     final int startPos = hasNulls ? 1 : 0;
-    return new Iterator<T>()
+    return new Iterator<>()
     {
       int pos = 0;
+
       @Override
       public boolean hasNext()
       {
diff --git a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
index f3f1457c503f..58231fd26029 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
@@ -346,7 +346,7 @@ public Iterator<ByteBuffer> iterator()
     copy.position(bucketsPosition);
     final ByteBuffer[] firstBucket = readBucket(copy, numBuckets > 1 ? bucketSize : lastBucketNumValues);
     // iterator decodes and buffers a bucket at a time, paging through buckets as the iterator is consumed
-    return new Iterator<ByteBuffer>()
+    return new Iterator<>()
     {
       private int currIndex = 0;
       private int currentBucketIndex = 0;
diff --git a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIntArrayIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIntArrayIndexed.java
index de7ce2d977f7..9543bdfb3287 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIntArrayIndexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIntArrayIndexed.java
@@ -289,7 +289,7 @@ public Iterator<int[]> iterator()
     copy.position(bucketsPosition);
     final int[][] firstBucket = readBucket(copy, numBuckets > 1 ? bucketSize : lastBucketNumValues);
     // iterator decodes and buffers a bucket at a time, paging through buckets as the iterator is consumed
-    return new Iterator<int[]>()
+    return new Iterator<>()
     {
       private int currIndex = 0;
       private int currentBucketIndex = 0;
diff --git a/processing/src/main/java/org/apache/druid/segment/data/GenericIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexed.java
index 19c58e411f33..0bf8aebd22ac 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/GenericIndexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexed.java
@@ -103,7 +103,7 @@ public abstract class GenericIndexed<T> implements CloseableIndexed<T>, Serializ
    * The compare method of this instance uses {@link StringUtils#compareUtf8UsingJavaStringOrdering(byte[], byte[])}
    * so that behavior is consistent with {@link #STRING_STRATEGY}.
    */
-  public static final ObjectStrategy<ByteBuffer> UTF8_STRATEGY = new ObjectStrategy<ByteBuffer>()
+  public static final ObjectStrategy<ByteBuffer> UTF8_STRATEGY = new ObjectStrategy<>()
   {
     @Override
     public Class<ByteBuffer> getClazz()
@@ -141,7 +141,7 @@ public int compare(@Nullable ByteBuffer o1, @Nullable ByteBuffer o2)
     }
   };
 
-  public static final ObjectStrategy<String> STRING_STRATEGY = new ObjectStrategy<String>()
+  public static final ObjectStrategy<String> STRING_STRATEGY = new ObjectStrategy<>()
   {
     @Override
     public Class<String> getClazz()
diff --git a/processing/src/main/java/org/apache/druid/segment/data/GenericIndexedWriter.java b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexedWriter.java
index a87a61843fac..ebf8f08d768e 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/GenericIndexedWriter.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexedWriter.java
@@ -96,7 +96,7 @@ public static ObjectStrategy<ByteBuffer> compressedByteBuffersWriteObjectStrateg
       final Closer closer
   )
   {
-    return new ObjectStrategy<ByteBuffer>()
+    return new ObjectStrategy<>()
     {
       private final CompressionStrategy.Compressor compressor = compressionStrategy.getCompressor();
       private final ByteBuffer compressedDataBuffer = compressor.allocateOutBuffer(bufferSize, closer);
diff --git a/processing/src/main/java/org/apache/druid/segment/data/Indexed.java b/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
index f85e1a84168e..9c1b36720078 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
@@ -41,7 +41,7 @@ public interface Indexed<T> extends Iterable<T>, HotLoopCallee
 {
   static <T> Indexed<T> empty()
   {
-    return new Indexed<T>()
+    return new Indexed<>()
     {
       @Override
       public int size()
diff --git a/processing/src/main/java/org/apache/druid/segment/data/IndexedIterable.java b/processing/src/main/java/org/apache/druid/segment/data/IndexedIterable.java
index 2fe15f2880cb..c01e90388e36 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/IndexedIterable.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/IndexedIterable.java
@@ -30,7 +30,7 @@ public class IndexedIterable<T> implements Iterable<T>
 
   public static <T> IndexedIterable<T> create(Indexed<T> indexed)
   {
-    return new IndexedIterable<T>(indexed);
+    return new IndexedIterable<>(indexed);
   }
 
   public IndexedIterable(Indexed<T> indexed)
@@ -41,7 +41,7 @@ public IndexedIterable(Indexed<T> indexed)
   @Override
   public Iterator<T> iterator()
   {
-    return new Iterator<T>()
+    return new Iterator<>()
     {
       private int currIndex = 0;
 
diff --git a/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java b/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java
index f078e8dbac51..07af8e6d3bd8 100644
--- a/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java
+++ b/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java
@@ -139,7 +139,7 @@ public DataGenerator reset(long seed)
     columnGenerators.addAll(
         Lists.transform(
             columnSchemas,
-            new Function<GeneratorColumnSchema, ColumnValueGenerator>()
+            new Function<>()
             {
               @Override
               public ColumnValueGenerator apply(
diff --git a/processing/src/main/java/org/apache/druid/segment/generator/SequentialDistribution.java b/processing/src/main/java/org/apache/druid/segment/generator/SequentialDistribution.java
index 514540be0631..ab16c1b8dff8 100644
--- a/processing/src/main/java/org/apache/druid/segment/generator/SequentialDistribution.java
+++ b/processing/src/main/java/org/apache/druid/segment/generator/SequentialDistribution.java
@@ -37,7 +37,7 @@ public class SequentialDistribution extends EnumeratedDistribution
   public SequentialDistribution(Integer start, Integer end, List<Object> enumeratedValues)
   {
     // just pass in some bogus probability mass function, we won't be using it
-    super(Collections.singletonList(new Pair<Object, Double>(null, 1.0)));
+    super(Collections.singletonList(new Pair<>(null, 1.0)));
     this.start = start;
     this.end = end;
     this.enumeratedValues = enumeratedValues;
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java
index 2e817b993ce0..8c3b0a8cc42e 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java
@@ -137,7 +137,7 @@ public String toString()
     return "IncrementalIndexRow{" +
            "timestamp=" + DateTimes.utc(timestamp) +
            ", dims=" + Lists.transform(
-        Arrays.asList(dims), new Function<Object, Object>()
+        Arrays.asList(dims), new Function<>()
         {
           @Override
           public Object apply(@Nullable Object input)
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java b/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java
index 8c4c8d4448be..27b908126280 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java
@@ -87,7 +87,7 @@ public InputRow apply(final InputRow row)
     final List<String> finalDims = Lists.newArrayList(
         Iterables.filter(
             row.getDimensions(),
-            new Predicate<String>()
+            new Predicate<>()
             {
               @Override
               public boolean apply(String input)
diff --git a/processing/src/main/java/org/apache/druid/segment/index/IndexedStringDruidPredicateIndexes.java b/processing/src/main/java/org/apache/druid/segment/index/IndexedStringDruidPredicateIndexes.java
index 42a8982d7baf..ca866f1c2a25 100644
--- a/processing/src/main/java/org/apache/druid/segment/index/IndexedStringDruidPredicateIndexes.java
+++ b/processing/src/main/java/org/apache/druid/segment/index/IndexedStringDruidPredicateIndexes.java
@@ -59,7 +59,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final Iterator<String> iterator = dictionary.iterator();
           boolean nextSet = false;
diff --git a/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8LexicographicalRangeIndexes.java b/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8LexicographicalRangeIndexes.java
index bc553b1bd019..60e67e22d36b 100644
--- a/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8LexicographicalRangeIndexes.java
+++ b/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8LexicographicalRangeIndexes.java
@@ -78,7 +78,7 @@ public Iterable<ImmutableBitmap> getBitmapIterable()
       {
         final IntIntPair range = getRange(startValue, startStrict, endValue, endStrict);
         final int start = range.leftInt(), end = range.rightInt();
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final IntIterator rangeIterator = IntListUtils.fromTo(start, end).iterator();
 
@@ -125,7 +125,7 @@ public BitmapColumnIndex forRange(
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable()
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           int currIndex = start;
           int found;
diff --git a/processing/src/main/java/org/apache/druid/segment/index/semantic/ValueSetIndexes.java b/processing/src/main/java/org/apache/druid/segment/index/semantic/ValueSetIndexes.java
index f31f0a7bfedf..5472cc84433f 100644
--- a/processing/src/main/java/org/apache/druid/segment/index/semantic/ValueSetIndexes.java
+++ b/processing/src/main/java/org/apache/druid/segment/index/semantic/ValueSetIndexes.java
@@ -107,7 +107,7 @@ public int estimatedComputeCost()
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable()
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final PeekingIterator<T> valuesIterator = Iterators.peekingIterator(values.iterator());
           final PeekingIterator<T> dictionaryIterator = Iterators.peekingIterator(dictionary.iterator());
@@ -196,7 +196,7 @@ public int estimatedComputeCost()
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable()
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final int dictionarySize = dictionary.size();
           final Iterator<T> iterator = values.iterator();
@@ -277,7 +277,7 @@ public int estimatedComputeCost()
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable()
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final Iterator<T> iterator = values.iterator();
           int next = -1;
diff --git a/processing/src/main/java/org/apache/druid/segment/join/lookup/LookupJoinMatcher.java b/processing/src/main/java/org/apache/druid/segment/join/lookup/LookupJoinMatcher.java
index 4f2c7e873f00..235ffd7c4dbc 100644
--- a/processing/src/main/java/org/apache/druid/segment/join/lookup/LookupJoinMatcher.java
+++ b/processing/src/main/java/org/apache/druid/segment/join/lookup/LookupJoinMatcher.java
@@ -57,7 +57,7 @@
 public class LookupJoinMatcher implements JoinMatcher
 {
   private static final ColumnProcessorFactory<Supplier<String>> LEFT_KEY_READER =
-      new ColumnProcessorFactory<Supplier<String>>()
+      new ColumnProcessorFactory<>()
       {
         @Override
         public ColumnType defaultType()
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/CompressedNestedDataComplexColumn.java b/processing/src/main/java/org/apache/druid/segment/nested/CompressedNestedDataComplexColumn.java
index c2e46cec107a..311e72cdcfe7 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/CompressedNestedDataComplexColumn.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/CompressedNestedDataComplexColumn.java
@@ -237,7 +237,7 @@ public Indexed<Object[]> getArrayDictionary()
       final FixedIndexed<Long> longDictionary = longDictionarySupplier.get();
       final FixedIndexed<Double> doubleDictionary = doubleDictionarySupplier.get();
 
-      return new Iterator<Object[]>()
+      return new Iterator<>()
       {
         final Iterator<int[]> delegate = arrayDictionarySupplier.get().iterator();
 
@@ -276,7 +276,7 @@ private Object lookupId(int globalId)
         }
       };
     };
-    return new Indexed<Object[]>()
+    return new Indexed<>()
     {
       @Override
       public int size()
@@ -553,7 +553,7 @@ public ColumnValueSelector<?> makeColumnValueSelector(List<NestedPathPart> path,
             arrayFieldIndex
         ).getColumn();
         ColumnValueSelector arraySelector = col.makeColumnValueSelector(readableOffset);
-        return new ColumnValueSelector<Object>()
+        return new ColumnValueSelector<>()
         {
           @Override
           public boolean isNull()
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/NestedDataComplexTypeSerde.java b/processing/src/main/java/org/apache/druid/segment/nested/NestedDataComplexTypeSerde.java
index 3236b42402c5..931dec70a9f0 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/NestedDataComplexTypeSerde.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/NestedDataComplexTypeSerde.java
@@ -98,7 +98,7 @@ public void deserializeColumn(
   @Override
   public ObjectStrategy getObjectStrategy()
   {
-    return new ObjectStrategy<Object>()
+    return new ObjectStrategy<>()
     {
       @Override
       public int compare(Object o1, Object o2)
@@ -206,7 +206,7 @@ public <T extends Comparable<T>> TypeStrategy<T> getTypeStrategy()
     return new ObjectStrategyComplexTypeStrategy<>(
         getObjectStrategy(),
         ColumnType.ofComplex(TYPE_NAME),
-        new Hash.Strategy<Object>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(Object o)
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
index d53596964f8b..3947013274c5 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
@@ -323,7 +323,7 @@ private <T> BitmapColumnIndex makeRangeIndex(
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable()
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final IntIterator rangeIterator = IntListUtils.fromTo(startIndex, endIndex).iterator();
 
@@ -550,7 +550,7 @@ public BitmapColumnIndex forRange(
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable()
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             int currIndex = start;
             int found;
@@ -620,7 +620,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final Indexed<ByteBuffer> stringDictionary = globalStringDictionarySupplier.get();
             final DruidObjectPredicate<String> stringPredicate = matcherFactory.makeStringPredicate();
@@ -914,7 +914,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final FixedIndexed<Long> longDictionary = globalLongDictionarySupplier.get();
             final DruidLongPredicate longPredicate = matcherFactory.makeLongPredicate();
@@ -1194,7 +1194,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final FixedIndexed<Integer> localDictionary = localDictionarySupplier.get();
             final FixedIndexed<Double> doubleDictionary = globalDoubleDictionarySupplier.get();
@@ -1430,7 +1430,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final DruidObjectPredicate<String> stringPredicate = matcherFactory.makeStringPredicate();
             final DruidLongPredicate longPredicate = matcherFactory.makeLongPredicate();
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldDictionaryEncodedColumn.java b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldDictionaryEncodedColumn.java
index e4746219e092..09877ab4c692 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldDictionaryEncodedColumn.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldDictionaryEncodedColumn.java
@@ -613,7 +613,7 @@ public boolean isNull()
       }
     }
     if (singleType == null || singleType.isArray()) {
-      return new ColumnValueSelector<Object>()
+      return new ColumnValueSelector<>()
       {
 
         private PeekableIntIterator nullIterator = nullBitmap.peekableIterator();
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
index 1bde18e188a8..8d1dd4227730 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
@@ -547,7 +547,7 @@ public BitmapColumnIndex forRange(
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable()
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final IntIterator rangeIterator = IntListUtils.fromTo(startIndex, endIndex).iterator();
 
@@ -587,7 +587,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final Iterator<Double> iterator = doubleDictionarySupplier.get().iterator();
             final DruidDoublePredicate doublePredicate = matcherFactory.makeDoublePredicate();
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
index 1b1b9fb97e7b..5a55a5f7c145 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
@@ -556,7 +556,7 @@ public BitmapColumnIndex forRange(
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable()
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final IntIterator rangeIterator = IntListUtils.fromTo(startIndex, endIndex).iterator();
 
@@ -596,7 +596,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final Iterator<Long> iterator = dictionary.iterator();
             final DruidLongPredicate longPredicate = matcherFactory.makeLongPredicate();
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/ValueDictionary.java b/processing/src/main/java/org/apache/druid/segment/nested/ValueDictionary.java
index b3f9dd0eca49..e4827ad43729 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/ValueDictionary.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/ValueDictionary.java
@@ -55,7 +55,7 @@ public class ValueDictionary
 
   public ValueDictionary()
   {
-    this.stringDictionary = new ComparatorDimensionDictionary<String>(GenericIndexed.STRING_STRATEGY)
+    this.stringDictionary = new ComparatorDimensionDictionary<>(GenericIndexed.STRING_STRATEGY)
     {
       @Override
       public long estimateSizeOfValue(String value)
@@ -63,7 +63,7 @@ public long estimateSizeOfValue(String value)
         return StructuredDataProcessor.estimateStringSize(value);
       }
     };
-    this.longDictionary = new ComparatorDimensionDictionary<Long>(ColumnType.LONG.getNullableStrategy())
+    this.longDictionary = new ComparatorDimensionDictionary<>(ColumnType.LONG.getNullableStrategy())
     {
       @Override
       public long estimateSizeOfValue(Long value)
@@ -71,7 +71,7 @@ public long estimateSizeOfValue(Long value)
         return StructuredDataProcessor.getLongObjectEstimateSize();
       }
     };
-    this.doubleDictionary = new ComparatorDimensionDictionary<Double>(ColumnType.DOUBLE.getNullableStrategy())
+    this.doubleDictionary = new ComparatorDimensionDictionary<>(ColumnType.DOUBLE.getNullableStrategy())
     {
       @Override
       public long estimateSizeOfValue(Double value)
@@ -161,7 +161,7 @@ public SortedValueDictionary getSortedCollector()
     final ComparatorSortedDimensionDictionary<String> sortedStringDimensionDictionary =
         stringDictionary.sort();
 
-    Indexed<String> strings = new Indexed<String>()
+    Indexed<String> strings = new Indexed<>()
     {
       @Override
       public int size()
@@ -200,7 +200,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
     final ComparatorSortedDimensionDictionary<Long> sortedLongDimensionDictionary =
         longDictionary.sort();
 
-    Indexed<Long> longs = new Indexed<Long>()
+    Indexed<Long> longs = new Indexed<>()
     {
       @Override
       public int size()
@@ -239,7 +239,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
     final ComparatorSortedDimensionDictionary<Double> sortedDoubleDimensionDictionary =
         doubleDictionary.sort();
 
-    Indexed<Double> doubles = new Indexed<Double>()
+    Indexed<Double> doubles = new Indexed<>()
     {
       @Override
       public int size()
@@ -278,7 +278,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
     // offset by 1 because nulls are ignored by the indexer, but always global id 0
     final int adjustLongs = 1 + strings.size();
     final int adjustDoubles = adjustLongs + longs.size();
-    TreeSet<Object[]> sortedArrays = new TreeSet<>(new Comparator<Object[]>()
+    TreeSet<Object[]> sortedArrays = new TreeSet<>(new Comparator<>()
     {
       @Override
       public int compare(Object[] o1, Object[] o2)
@@ -319,7 +319,7 @@ private int[] convertArray(Object[] array)
     sortedArrays.addAll(stringArrays);
     sortedArrays.addAll(longArrays);
     sortedArrays.addAll(doubleArrays);
-    Indexed<Object[]> sortedArraysIndexed = new Indexed<Object[]>()
+    Indexed<Object[]> sortedArraysIndexed = new Indexed<>()
     {
       @Override
       public Iterator<Object[]> iterator()
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/VariantColumn.java b/processing/src/main/java/org/apache/druid/segment/nested/VariantColumn.java
index 8125fe531006..4dd8feca9982 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/VariantColumn.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/VariantColumn.java
@@ -174,7 +174,7 @@ public Indexed<Double> getDoubleDictionary()
   @Override
   public Indexed<Object[]> getArrayDictionary()
   {
-    Iterable<Object[]> arrays = () -> new Iterator<Object[]>()
+    Iterable<Object[]> arrays = () -> new Iterator<>()
     {
       final Iterator<int[]> delegate = arrayDictionary.iterator();
 
@@ -213,7 +213,7 @@ private Object lookupId(int id)
         throw new IAE("Unknown id [%s]", id);
       }
     };
-    return new Indexed<Object[]>()
+    return new Indexed<>()
     {
       @Override
       public int size()
@@ -620,7 +620,7 @@ public int lookupId(String name)
   @Override
   public ColumnValueSelector<?> makeColumnValueSelector(ReadableOffset offset)
   {
-    return new ColumnValueSelector<Object>()
+    return new ColumnValueSelector<>()
     {
       private PeekableIntIterator nullIterator = nullValueBitmap.peekableIterator();
       private int nullMark = -1;
diff --git a/processing/src/main/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexed.java b/processing/src/main/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexed.java
index 3e109946d72e..539b89acf16f 100644
--- a/processing/src/main/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexed.java
@@ -68,7 +68,7 @@ protected CombineFirstTwoEntriesIndexed(Indexed<T> delegate)
    */
   public static <T> CombineFirstTwoEntriesIndexed<T> returnNull(final Indexed<T> delegate)
   {
-    return new CombineFirstTwoEntriesIndexed<T>(delegate)
+    return new CombineFirstTwoEntriesIndexed<>(delegate)
     {
       @Nullable
       @Override
@@ -87,7 +87,7 @@ public static CombineFirstTwoEntriesIndexed<ImmutableBitmap> unionBitmaps(
       final Indexed<ImmutableBitmap> delegate
   )
   {
-    return new CombineFirstTwoEntriesIndexed<ImmutableBitmap>(delegate)
+    return new CombineFirstTwoEntriesIndexed<>(delegate)
     {
       @Nullable
       @Override
diff --git a/processing/src/main/java/org/apache/druid/segment/serde/MetaSerdeHelper.java b/processing/src/main/java/org/apache/druid/segment/serde/MetaSerdeHelper.java
index 08e97e3e5017..d4a22c5945a1 100644
--- a/processing/src/main/java/org/apache/druid/segment/serde/MetaSerdeHelper.java
+++ b/processing/src/main/java/org/apache/druid/segment/serde/MetaSerdeHelper.java
@@ -55,7 +55,7 @@ public MetaSerdeHelper<T> writeByte(ByteFieldWriter<T> fieldWriter)
   public MetaSerdeHelper<T> maybeWriteByte(Predicate<T> condition, ByteFieldWriter<T> fieldWriter)
   {
     return writeSomething(
-        new FieldWriter<T>()
+        new FieldWriter<>()
         {
           @Override
           public void writeTo(ByteBuffer buffer, T x)
@@ -77,7 +77,7 @@ public int size(T x)
   public MetaSerdeHelper<T> writeByteArray(Function<T, byte[]> getByteArray)
   {
     return writeSomething(
-        new FieldWriter<T>()
+        new FieldWriter<>()
         {
           @Override
           public void writeTo(ByteBuffer buffer, T x)
diff --git a/processing/src/main/java/org/apache/druid/segment/serde/cell/StagedSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/cell/StagedSerde.java
index 476795b9f5e0..b6813189286a 100644
--- a/processing/src/main/java/org/apache/druid/segment/serde/cell/StagedSerde.java
+++ b/processing/src/main/java/org/apache/druid/segment/serde/cell/StagedSerde.java
@@ -66,7 +66,7 @@ public interface StagedSerde<T>
 {
   static StagedSerde<byte[]> forBytes()
   {
-    return new StagedSerde<byte[]>()
+    return new StagedSerde<>()
     {
       @Override
       public byte[] serialize(byte[] value)
diff --git a/processing/src/main/java/org/apache/druid/segment/virtual/ListFilteredVirtualColumn.java b/processing/src/main/java/org/apache/druid/segment/virtual/ListFilteredVirtualColumn.java
index f82949512345..dceae11099b4 100644
--- a/processing/src/main/java/org/apache/druid/segment/virtual/ListFilteredVirtualColumn.java
+++ b/processing/src/main/java/org/apache/druid/segment/virtual/ListFilteredVirtualColumn.java
@@ -322,7 +322,7 @@ private static Iterable<ImmutableBitmap> getBitmapsInRange(
       boolean includeUnknown
   )
   {
-    return () -> new Iterator<ImmutableBitmap>()
+    return () -> new Iterator<>()
     {
       int currIndex = start;
       int found;
diff --git a/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java b/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java
index 5ec5958f5863..663b272917b9 100644
--- a/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java
+++ b/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java
@@ -389,7 +389,7 @@ public ColumnValueSelector<?> makeColumnValueSelector(
       if (elementNumber < 0) {
         throw new IAE("Cannot make array element selector, negative array index not supported");
       }
-      return new ColumnValueSelector<Object>()
+      return new ColumnValueSelector<>()
       {
         @Override
         public boolean isNull()
diff --git a/processing/src/main/java/org/apache/druid/storage/remote/ChunkingStorageConnector.java b/processing/src/main/java/org/apache/druid/storage/remote/ChunkingStorageConnector.java
index 5d181b724881..80faf510c0a9 100644
--- a/processing/src/main/java/org/apache/druid/storage/remote/ChunkingStorageConnector.java
+++ b/processing/src/main/java/org/apache/druid/storage/remote/ChunkingStorageConnector.java
@@ -103,7 +103,7 @@ private InputStream buildInputStream(ChunkingStorageConnectorParameters<T> param
 
     return new SequenceInputStream(
 
-        new Enumeration<InputStream>()
+        new Enumeration<>()
         {
           boolean initStream = false;
 
diff --git a/processing/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java b/processing/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java
index 8855f0151e8c..a6e46f9ee9e3 100644
--- a/processing/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java
+++ b/processing/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java
@@ -32,7 +32,7 @@ public class IntegerPartitionChunk<T extends Overshadowable> implements Partitio
 
   public static <T extends Overshadowable> IntegerPartitionChunk<T> make(Integer start, Integer end, int chunkNumber, T obj)
   {
-    return new IntegerPartitionChunk<T>(start, end, chunkNumber, obj);
+    return new IntegerPartitionChunk<>(start, end, chunkNumber, obj);
   }
 
   public IntegerPartitionChunk(
diff --git a/processing/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java b/processing/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java
index 2d32532bece0..a4d50b315b8e 100644
--- a/processing/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java
+++ b/processing/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java
@@ -35,7 +35,7 @@ public static <T> NumberedPartitionChunk<T> make(
       T obj
   )
   {
-    return new NumberedPartitionChunk<T>(chunkNumber, chunks, obj);
+    return new NumberedPartitionChunk<>(chunkNumber, chunks, obj);
   }
 
   public NumberedPartitionChunk(
diff --git a/processing/src/main/java/org/apache/druid/timeline/partition/OvershadowableManager.java b/processing/src/main/java/org/apache/druid/timeline/partition/OvershadowableManager.java
index dbcf5658f017..c7376a874ab6 100644
--- a/processing/src/main/java/org/apache/druid/timeline/partition/OvershadowableManager.java
+++ b/processing/src/main/java/org/apache/druid/timeline/partition/OvershadowableManager.java
@@ -1202,7 +1202,7 @@ public ShortSortedSet keySet()
     @Override
     public ObjectCollection<V> values()
     {
-      return new AbstractObjectCollection<V>()
+      return new AbstractObjectCollection<>()
       {
         @Override
         public ObjectIterator<V> iterator()
diff --git a/processing/src/main/java/org/apache/druid/timeline/partition/TombstonePartitionedChunk.java b/processing/src/main/java/org/apache/druid/timeline/partition/TombstonePartitionedChunk.java
index 5bf8a430ee25..23f7eb643d96 100644
--- a/processing/src/main/java/org/apache/druid/timeline/partition/TombstonePartitionedChunk.java
+++ b/processing/src/main/java/org/apache/druid/timeline/partition/TombstonePartitionedChunk.java
@@ -27,7 +27,7 @@ public class TombstonePartitionedChunk<T> implements PartitionChunk<T>
 
   public static <T> TombstonePartitionedChunk<T> make(T obj)
   {
-    return new TombstonePartitionedChunk<T>(obj);
+    return new TombstonePartitionedChunk<>(obj);
   }
 
   public TombstonePartitionedChunk(T object)
diff --git a/processing/src/main/java/org/apache/druid/utils/CollectionUtils.java b/processing/src/main/java/org/apache/druid/utils/CollectionUtils.java
index bd7600f6c03c..1309d85f4e12 100644
--- a/processing/src/main/java/org/apache/druid/utils/CollectionUtils.java
+++ b/processing/src/main/java/org/apache/druid/utils/CollectionUtils.java
@@ -51,7 +51,7 @@ public final class CollectionUtils
    */
   public static <E> Collection<E> createLazyCollectionFromStream(Supplier<Stream<E>> sequentialStreamSupplier, int size)
   {
-    return new AbstractCollection<E>()
+    return new AbstractCollection<>()
     {
       @Override
       public Iterator<E> iterator()
diff --git a/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapIterationTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapIterationTest.java
index be37546d3bb7..94a9b3a95406 100644
--- a/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapIterationTest.java
+++ b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapIterationTest.java
@@ -89,7 +89,7 @@ private BitmapCollection(ImmutableBitmap bitmap, int size)
     public UnmodifiableIterator<Integer> iterator()
     {
       final IntIterator iterator = bitmap.iterator();
-      return new UnmodifiableIterator<Integer>()
+      return new UnmodifiableIterator<>()
       {
         @Override
         public boolean hasNext()
diff --git a/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapOperationTestBase.java b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapOperationTestBase.java
index d521f2ef4ece..e94db7f42e34 100644
--- a/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapOperationTestBase.java
+++ b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapOperationTestBase.java
@@ -74,7 +74,7 @@ protected static ResourceHolder<ImmutableConciseSet> makeOffheapConcise(Immutabl
     buf.rewind();
     final ImmutableConciseSet bitmap = new ImmutableConciseSet(buf.asIntBuffer());
 
-    return new ResourceHolder<ImmutableConciseSet>()
+    return new ResourceHolder<>()
     {
       @Override
       public ImmutableConciseSet get()
@@ -151,7 +151,7 @@ protected static ResourceHolder<ImmutableRoaringBitmap> makeOffheapRoaring(Mutab
     roaringCount++;
     final ImmutableRoaringBitmap bitmap = writeImmutable(r, buf);
 
-    return new ResourceHolder<ImmutableRoaringBitmap>()
+    return new ResourceHolder<>()
     {
       @Override
       public ImmutableRoaringBitmap get()
diff --git a/processing/src/test/java/org/apache/druid/collections/bitmap/ConciseBitmapFactoryTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/ConciseBitmapFactoryTest.java
index c172630765aa..71062abffd98 100644
--- a/processing/src/test/java/org/apache/druid/collections/bitmap/ConciseBitmapFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/collections/bitmap/ConciseBitmapFactoryTest.java
@@ -41,7 +41,7 @@ public void testUnwrapWithNull()
     ImmutableBitmap bitmap = factory.union(
         Iterables.transform(
             Collections.singletonList(new WrappedConciseBitmap()),
-            new Function<WrappedConciseBitmap, ImmutableBitmap>()
+            new Function<>()
             {
               @Override
               public ImmutableBitmap apply(WrappedConciseBitmap input)
diff --git a/processing/src/test/java/org/apache/druid/collections/bitmap/RoaringBitmapFactoryTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/RoaringBitmapFactoryTest.java
index af60e3f806e1..9814e13ad150 100644
--- a/processing/src/test/java/org/apache/druid/collections/bitmap/RoaringBitmapFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/collections/bitmap/RoaringBitmapFactoryTest.java
@@ -59,7 +59,7 @@ public void testUnwrapWithNull()
     ImmutableBitmap bitmap = factory.union(
         Iterables.transform(
             Collections.singletonList(new WrappedRoaringBitmap()),
-            new Function<WrappedRoaringBitmap, ImmutableBitmap>()
+            new Function<>()
             {
               @Override
               public ImmutableBitmap apply(WrappedRoaringBitmap input)
diff --git a/processing/src/test/java/org/apache/druid/common/config/JacksonConfigManagerTest.java b/processing/src/test/java/org/apache/druid/common/config/JacksonConfigManagerTest.java
index 0d0393459445..404eb5547139 100644
--- a/processing/src/test/java/org/apache/druid/common/config/JacksonConfigManagerTest.java
+++ b/processing/src/test/java/org/apache/druid/common/config/JacksonConfigManagerTest.java
@@ -88,9 +88,7 @@ public void testConvertByteToConfigWithNullConfigInByte()
   @Test
   public void testConvertByteToConfigWithNonNullConfigInByte()
   {
-    ConfigSerde<TestConfig> configConfigSerdeFromTypeReference = jacksonConfigManager.create(new TypeReference<TestConfig>()
-    {
-    }, null);
+    ConfigSerde<TestConfig> configConfigSerdeFromTypeReference = jacksonConfigManager.create(new TypeReference<>() {}, null);
     TestConfig defaultConfig = new TestConfig("version", null, 3);
     TestConfig expectedConfig = new TestConfig("version2", null, 5);
     byte[] expectedConfigInByte = configConfigSerdeFromTypeReference.serialize(expectedConfig);
diff --git a/processing/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java b/processing/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java
index 437c38251703..d8888a792587 100644
--- a/processing/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java
@@ -283,7 +283,7 @@ private void testCombining(
 
     Yielder<Pair<Integer, Integer>> yielder = seq.toYielder(
         null,
-        new YieldingAccumulator<Pair<Integer, Integer>, Pair<Integer, Integer>>()
+        new YieldingAccumulator<>()
         {
           int count = 0;
 
@@ -303,7 +303,7 @@ public Pair<Integer, Integer> accumulate(
 
     Iterator<Pair<Integer, Integer>> expectedVals = Iterators.filter(
         expected.iterator(),
-        new Predicate<Pair<Integer, Integer>>()
+        new Predicate<>()
         {
           int count = 0;
 
diff --git a/processing/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java b/processing/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java
index bf1099ccc0f9..440c57ad8010 100644
--- a/processing/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java
@@ -66,7 +66,7 @@ private void check(String expected, Sequence<Integer> complex)
 
     Yielder<Integer> yielder = complex.toYielder(
         null,
-        new YieldingAccumulator<Integer, Integer>()
+        new YieldingAccumulator<>()
         {
           @Override
           public Integer accumulate(Integer accumulated, Integer in)
diff --git a/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java b/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
index 8ec9584dcac9..110268ba84e3 100644
--- a/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
+++ b/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
@@ -84,7 +84,7 @@ public void testCancelAll()
         for (int i = 0; i < taskCount; i++) {
           final CountDownLatch latch = new CountDownLatch(1);
           latches.add(latch);
-          ListenableFuture<Object> future = exc.submit(new Callable<Object>()
+          ListenableFuture<Object> future = exc.submit(new Callable<>()
           {
             @Override
             public Object call() throws RuntimeException, InterruptedException
diff --git a/processing/src/test/java/org/apache/druid/common/jackson/JacksonUtilsTest.java b/processing/src/test/java/org/apache/druid/common/jackson/JacksonUtilsTest.java
index 5e70962ef8a9..8b546d36aff9 100644
--- a/processing/src/test/java/org/apache/druid/common/jackson/JacksonUtilsTest.java
+++ b/processing/src/test/java/org/apache/druid/common/jackson/JacksonUtilsTest.java
@@ -58,7 +58,7 @@ public void testWriteObjectUsingSerializerProvider() throws IOException
 
     final List<SerializableClass> deserializedValues = objectMapper.readValue(
         baos.toByteArray(),
-        new TypeReference<List<SerializableClass>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(
@@ -85,7 +85,7 @@ public void testWritePrimitivesUsingSerializerProvider() throws IOException
 
     final List<Object> deserializedValues = objectMapper.readValue(
         baos.toByteArray(),
-        new TypeReference<List<Object>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(
diff --git a/processing/src/test/java/org/apache/druid/common/semantic/SemanticCreatorUsageTest.java b/processing/src/test/java/org/apache/druid/common/semantic/SemanticCreatorUsageTest.java
index 0dd61fb4b3ea..e5cebcb9c52a 100644
--- a/processing/src/test/java/org/apache/druid/common/semantic/SemanticCreatorUsageTest.java
+++ b/processing/src/test/java/org/apache/druid/common/semantic/SemanticCreatorUsageTest.java
@@ -49,7 +49,7 @@ public class SemanticCreatorUsageTest
   @Parameters(name = "{0}")
   public static List<Object[]> getParameters()
   {
-    List<Object[]> params = new ArrayList<Object[]>();
+    List<Object[]> params = new ArrayList<>();
     Set<Method> methodsAnnotatedWith = new Reflections("org.apache", new MethodAnnotationsScanner())
         .getMethodsAnnotatedWith(SemanticCreator.class);
 
diff --git a/processing/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java b/processing/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java
index d822d2280663..7a3f7fcb3876 100644
--- a/processing/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java
+++ b/processing/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java
@@ -59,7 +59,7 @@ public static Collection<Object[]> constructorFeeder()
     }
     return Collections2.transform(
         args,
-        new Function<String[], Object[]>()
+        new Function<>()
         {
           @Override
           public Object[] apply(String[] input)
diff --git a/processing/src/test/java/org/apache/druid/data/input/HandlingInputRowIteratorTest.java b/processing/src/test/java/org/apache/druid/data/input/HandlingInputRowIteratorTest.java
index 3fa5a3bef27e..bd481435e067 100644
--- a/processing/src/test/java/org/apache/druid/data/input/HandlingInputRowIteratorTest.java
+++ b/processing/src/test/java/org/apache/druid/data/input/HandlingInputRowIteratorTest.java
@@ -44,7 +44,7 @@ public class HandlingInputRowIteratorTest
   public static class AbsentRowTest
   {
     private static final CloseableIterator<InputRow> EMPTY_ITERATOR = CloseableIterators.withEmptyBaggage(
-        new Iterator<InputRow>()
+        new Iterator<>()
         {
           @Override
           public boolean hasNext()
@@ -143,7 +143,7 @@ private static HandlingInputRowIterator createInputRowIterator(
         HandlingInputRowIterator.InputRowHandler secondHandler)
     {
       CloseableIterator<InputRow> iterator = CloseableIterators.withEmptyBaggage(
-          new Iterator<InputRow>()
+          new Iterator<>()
           {
             private final Iterator<InputRow> delegate = INPUT_ROWS.iterator();
 
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java
index dfb9d73d243a..08c3f4dd1544 100644
--- a/processing/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java
+++ b/processing/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java
@@ -153,7 +153,7 @@ public void testParseRowWithNullsInArrays()
   @Test
   public void testSerde() throws IOException
   {
-    HashMap<String, Boolean> feature = new HashMap<String, Boolean>();
+    HashMap<String, Boolean> feature = new HashMap<>();
     feature.put("ALLOW_UNQUOTED_CONTROL_CHARS", true);
     JSONParseSpec spec = new JSONParseSpec(
         new TimestampSpec("timestamp", "iso", null),
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java
index 8a6241e25b94..24791d800f90 100644
--- a/processing/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java
+++ b/processing/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java
@@ -47,9 +47,7 @@ public void testSerde() throws IOException
     final ObjectMapper mapper = new ObjectMapper(new SmileFactory());
     List<Map<String, Object>> expectedList = ImmutableList.of(ImmutableMap.of("key1", "value1", "key2", 2));
     File testFile = File.createTempFile("testfile", "");
-    TypeReference<Map<String, Object>> type = new TypeReference<Map<String, Object>>()
-    {
-    };
+    TypeReference<Map<String, Object>> type = new TypeReference<>() {};
     try (FileOutputStream fos = new FileOutputStream(testFile)) {
       final JsonGenerator jg = mapper.getFactory().createGenerator(fos);
       final SerializerProvider serializers = mapper.getSerializerProviderInstance();
diff --git a/processing/src/test/java/org/apache/druid/frame/file/FrameFileTest.java b/processing/src/test/java/org/apache/druid/frame/file/FrameFileTest.java
index acc2572664b8..3853cf697cd5 100644
--- a/processing/src/test/java/org/apache/druid/frame/file/FrameFileTest.java
+++ b/processing/src/test/java/org/apache/druid/frame/file/FrameFileTest.java
@@ -427,7 +427,7 @@ private static byte[] computeFrameFile(final FrameFileKey frameFileKey)
                                 .maxRowsPerFrame(frameFileKey.maxRowsPerFrame)
                                 .frames()
                                 .map(
-                                    new Function<Frame, IntObjectPair<Frame>>()
+                                    new Function<>()
                                     {
                                       private int rows = 0;
 
diff --git a/processing/src/test/java/org/apache/druid/frame/processor/FrameProcessorExecutorTest.java b/processing/src/test/java/org/apache/druid/frame/processor/FrameProcessorExecutorTest.java
index 000de90a83de..f6ced8f7c1c5 100644
--- a/processing/src/test/java/org/apache/druid/frame/processor/FrameProcessorExecutorTest.java
+++ b/processing/src/test/java/org/apache/druid/frame/processor/FrameProcessorExecutorTest.java
@@ -470,7 +470,7 @@ List<File> writeToNFiles(final CursorFactory cursorFactory, final int numFiles)
         }
 
         // Write to input files.
-        final Consumer<Frame> writer = new Consumer<Frame>()
+        final Consumer<Frame> writer = new Consumer<>()
         {
           private int j = 0;
 
diff --git a/processing/src/test/java/org/apache/druid/frame/processor/RunAllFullyWidgetTest.java b/processing/src/test/java/org/apache/druid/frame/processor/RunAllFullyWidgetTest.java
index d0ae5a986a00..f872608f3a38 100644
--- a/processing/src/test/java/org/apache/druid/frame/processor/RunAllFullyWidgetTest.java
+++ b/processing/src/test/java/org/apache/druid/frame/processor/RunAllFullyWidgetTest.java
@@ -637,7 +637,7 @@ public ListenableFuture<Optional<ProcessorAndCallback<T>>> next()
 
       Futures.addCallback(
           future,
-          new FutureCallback<Optional<ProcessorAndCallback<T>>>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(Optional<ProcessorAndCallback<T>> result)
diff --git a/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java b/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java
index 80e7f6352d00..6f49fdb82f35 100644
--- a/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java
+++ b/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java
@@ -818,7 +818,7 @@ private static List<ReadableFrameChannel> makeRoundRobinChannels(
     }
 
     frames.forEach(
-        new Consumer<Frame>()
+        new Consumer<>()
         {
           private int i;
 
diff --git a/processing/src/test/java/org/apache/druid/frame/testutil/FrameSequenceBuilder.java b/processing/src/test/java/org/apache/druid/frame/testutil/FrameSequenceBuilder.java
index 1cb6298b8b10..ac6faf00363f 100644
--- a/processing/src/test/java/org/apache/druid/frame/testutil/FrameSequenceBuilder.java
+++ b/processing/src/test/java/org/apache/druid/frame/testutil/FrameSequenceBuilder.java
@@ -157,7 +157,7 @@ public Iterator<Frame> make()
           {
             final ColumnSelectorFactory columnSelectorFactory = cursor.getColumnSelectorFactory();
 
-            return new Iterator<Frame>()
+            return new Iterator<>()
             {
               @Override
               public boolean hasNext()
diff --git a/processing/src/test/java/org/apache/druid/frame/write/cast/TypeCastSelectorsTest.java b/processing/src/test/java/org/apache/druid/frame/write/cast/TypeCastSelectorsTest.java
index dc2a4a5b46cf..77f06dc00372 100644
--- a/processing/src/test/java/org/apache/druid/frame/write/cast/TypeCastSelectorsTest.java
+++ b/processing/src/test/java/org/apache/druid/frame/write/cast/TypeCastSelectorsTest.java
@@ -337,7 +337,7 @@ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec)
     @Override
     public ColumnValueSelector<?> makeColumnValueSelector(String columnName)
     {
-      return new ColumnValueSelector<Object>()
+      return new ColumnValueSelector<>()
       {
         @Override
         public double getDouble()
diff --git a/processing/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java b/processing/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java
index 4387ab240686..7343e2879b11 100644
--- a/processing/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java
+++ b/processing/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java
@@ -72,9 +72,7 @@ public void configure(Binder binder)
       }
     });
 
-    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }));
+    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
 
     Assert.assertEquals(1, animalSet.size());
     Assert.assertEquals(animalSet, ImmutableSet.<Animal>of(new Cat()));
@@ -96,9 +94,7 @@ public void configure(Binder binder)
       }
     });
 
-    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }));
+    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
 
     Assert.assertEquals(2, animalSet.size());
     Assert.assertEquals(animalSet, ImmutableSet.of(new Cat(), new Dog()));
@@ -123,9 +119,7 @@ public void configure(Binder binder)
       }
     });
 
-    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }));
+    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
 
     Assert.assertEquals(2, animalSet.size());
     Assert.assertEquals(animalSet, ImmutableSet.of(new Cat(), new Dog()));
@@ -159,9 +153,7 @@ public void configure(Binder binder)
         }
     );
 
-    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }));
+    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
 
     Assert.assertEquals(3, animalSet.size());
     Assert.assertEquals(animalSet, ImmutableSet.of(new Cat(), new Dog(), new Fish()));
@@ -198,15 +190,11 @@ public void configure(Binder binder)
         }
     );
 
-    Set<Animal> animalSet_1 = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }, SanDiego.class));
+    Set<Animal> animalSet_1 = injector.getInstance(Key.get(new TypeLiteral<>() {}, SanDiego.class));
     Assert.assertEquals(4, animalSet_1.size());
     Assert.assertEquals(animalSet_1, ImmutableSet.of(new Bird(), new Cat(), new Dog(), new Tiger()));
 
-    Set<Animal> animalSet_2 = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }, SanJose.class));
+    Set<Animal> animalSet_2 = injector.getInstance(Key.get(new TypeLiteral<>() {}, SanJose.class));
     Assert.assertEquals(1, animalSet_2.size());
     Assert.assertEquals(animalSet_2, ImmutableSet.<Animal>of(new Fish()));
   }
@@ -293,21 +281,21 @@ public void configure(Binder binder)
 
             ConditionalMultibind
                 .create(props, binder, new TypeLiteral<Zoo<Animal>>() {})
-                .addBinding(new TypeLiteral<Zoo<Animal>>() {});
+                .addBinding(new TypeLiteral<>() {});
 
           }
         }
     );
 
-    Set<Set<Animal>> actualAnimalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Set<Animal>>>() {}));
+    Set<Set<Animal>> actualAnimalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertEquals(3, actualAnimalSet.size());
     Assert.assertEquals(ImmutableSet.of(set1, set2, set3), actualAnimalSet);
 
-    actualAnimalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Set<Animal>>>() {}, SanDiego.class));
+    actualAnimalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}, SanDiego.class));
     Assert.assertEquals(1, actualAnimalSet.size());
     Assert.assertEquals(ImmutableSet.of(union), actualAnimalSet);
 
-    final Set<Zoo<Animal>> actualZooSet = injector.getInstance(Key.get(new TypeLiteral<Set<Zoo<Animal>>>() {}));
+    final Set<Zoo<Animal>> actualZooSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertEquals(2, actualZooSet.size());
     Assert.assertEquals(ImmutableSet.of(zoo1, zoo2), actualZooSet);
   }
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java
index 3417e05b6944..7b547801d930 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java
@@ -51,12 +51,12 @@ public void testExceptionThrownInIterator()
   {
     final AtomicInteger closedCounter = new AtomicInteger(0);
     Sequence<Integer> seq = new BaseSequence<>(
-        new BaseSequence.IteratorMaker<Integer, Iterator<Integer>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<Integer> make()
           {
-            return new Iterator<Integer>()
+            return new Iterator<>()
             {
               @Override
               public boolean hasNext()
@@ -92,7 +92,7 @@ public void cleanup(Iterator<Integer> iterFromMake)
   private static <T> Sequence<T> makeBaseSequence(final Iterable<T> iterable)
   {
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<T, Iterator<T>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<T> make()
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java
index 477357e07920..8e26afbf4b40 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java
@@ -108,7 +108,7 @@ public void testClosingOfSequenceSequence() throws Exception
     final int[] closedCount = {0};
     final Sequence<Integer> seq = Sequences.concat(
         new BaseSequence<>(
-            new BaseSequence.IteratorMaker<Sequence<Integer>, Iterator<Sequence<Integer>>>()
+            new BaseSequence.IteratorMaker<>()
             {
               @Override
               public Iterator<Sequence<Integer>> make()
@@ -132,7 +132,7 @@ public void cleanup(Iterator<Sequence<Integer>> iterFromMake)
         9,
         seq.accumulate(
             1,
-            new Accumulator<Integer, Integer>()
+            new Accumulator<>()
             {
               @Override
               public Integer accumulate(Integer accumulated, Integer in)
@@ -148,7 +148,7 @@ public Integer accumulate(Integer accumulated, Integer in)
 
     final Yielder<Integer> yielder = seq.toYielder(
         1,
-        new YieldingAccumulator<Integer, Integer>()
+        new YieldingAccumulator<>()
         {
           @Override
           public Integer accumulate(Integer accumulated, Integer in)
@@ -171,7 +171,7 @@ public void testClosingOfSequenceSequenceWhenExceptionThrown()
     final AtomicInteger closedCount = new AtomicInteger(0);
     final Sequence<Integer> seq = Sequences.concat(
         new BaseSequence<>(
-            new BaseSequence.IteratorMaker<Sequence<Integer>, Iterator<Sequence<Integer>>>()
+            new BaseSequence.IteratorMaker<>()
             {
               @Override
               public Iterator<Sequence<Integer>> make()
@@ -207,21 +207,21 @@ public void testEnsureNextSequenceIsCalledLazilyInToYielder() throws Exception
                     ImmutableList.of(4, 5, 6)
                 )
             ),
-            new Function<ImmutableList<Integer>, Sequence<Integer>>()
+            new Function<>()
             {
               @Override
               public Sequence<Integer> apply(final ImmutableList<Integer> input)
               {
                 if (lastSeqFullyRead.getAndSet(false)) {
                   return Sequences.simple(
-                      new Iterable<Integer>()
+                      new Iterable<>()
                       {
                         private Iterator<Integer> baseIter = input.iterator();
 
                         @Override
                         public Iterator<Integer> iterator()
                         {
-                          return new Iterator<Integer>()
+                          return new Iterator<>()
                           {
                             @Override
                             public boolean hasNext()
@@ -258,7 +258,7 @@ public void remove()
 
     Yielder<Integer> yielder = seq.toYielder(
         null,
-        new YieldingAccumulator<Integer, Integer>()
+        new YieldingAccumulator<>()
         {
           @Override
           public Integer accumulate(Integer accumulated, Integer in)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java
index a7d9aebab545..60982a60ca25 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java
@@ -35,7 +35,7 @@ public class FilteredSequenceTest
   @Test
   public void testSanity() throws Exception
   {
-    Predicate<Integer> pred = new Predicate<Integer>()
+    Predicate<Integer> pred = new Predicate<>()
     {
       @Override
       public boolean apply(Integer input)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java
index 1c866f18488f..2bc1468903f5 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java
@@ -106,7 +106,7 @@ public void testFilter()
         Lists.newArrayList(
             FunctionalIterable.create(Arrays.asList("1", "2", "3"))
                               .filter(
-                                  new Predicate<String>()
+                                  new Predicate<>()
                                   {
                                     @Override
                                     public boolean apply(String input)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java
index d32bc014240e..73feacc21adb 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java
@@ -107,7 +107,7 @@ public void testFilter()
         Lists.newArrayList(
             FunctionalIterator.create(Arrays.asList("1", "2", "3").iterator())
                               .filter(
-                                  new Predicate<String>()
+                                  new Predicate<>()
                                   {
                                     @Override
                                     public boolean apply(String input)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java
index d26a950bdd74..625449038306 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java
@@ -74,7 +74,7 @@ public void testWithYieldingSequence()
     // Create a Sequence whose Yielders will yield for each element, regardless of what the accumulator passed
     // to "toYielder" does.
     final BaseSequence<Integer, Iterator<Integer>> sequence = new BaseSequence<Integer, Iterator<Integer>>(
-        new BaseSequence.IteratorMaker<Integer, Iterator<Integer>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<Integer> make()
@@ -98,7 +98,7 @@ public <OutType> Yielder<OutType> toYielder(
       {
         return super.toYielder(
             initValue,
-            new DelegatingYieldingAccumulator<OutType, Integer>(accumulator)
+            new DelegatingYieldingAccumulator<>(accumulator)
             {
               @Override
               public OutType accumulate(OutType accumulated, Integer in)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java
index 1464615b9d4d..d91fe2377eb1 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java
@@ -34,7 +34,7 @@ public class MappedSequenceTest
   @Test
   public void testSanity() throws Exception
   {
-    Function<Integer, Integer> fn = new Function<Integer, Integer>()
+    Function<Integer, Integer> fn = new Function<>()
     {
       @Override
       public Integer apply(Integer input)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequenceTest.java
index cbe84cb4eec1..d088e7e1afd2 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequenceTest.java
@@ -985,15 +985,16 @@ public static Sequence<IntPair> nonBlockingSequence(int size, boolean lazyGenera
   {
     List<IntPair> pairs = lazyGenerate ? null : generateOrderedPairs(size);
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<IntPair, Iterator<IntPair>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<IntPair> make()
           {
-            return new Iterator<IntPair>()
+            return new Iterator<>()
             {
               int mergeKey = 0;
               int rowCounter = 0;
+
               @Override
               public boolean hasNext()
               {
@@ -1046,15 +1047,16 @@ public static Sequence<IntPair> blockingSequence(
     final long startDelayMillis = ThreadLocalRandom.current().nextLong(startDelayStartMillis, startDelayEndMillis);
     final long delayUntil = System.nanoTime() + TimeUnit.NANOSECONDS.convert(startDelayMillis, TimeUnit.MILLISECONDS);
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<IntPair, Iterator<IntPair>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<IntPair> make()
           {
-            return new Iterator<IntPair>()
+            return new Iterator<>()
             {
               int mergeKey = 0;
               int rowCounter = 0;
+
               @Override
               public boolean hasNext()
               {
@@ -1130,10 +1132,11 @@ public Iterator<IntPair> make()
             {
               // we got yielder, decrement so we expect it to be incremented again on cleanup
               explodedIteratorMakerCleanup.decrementAndGet();
-              return new Iterator<IntPair>()
+              return new Iterator<>()
               {
                 int mergeKey = 0;
                 int rowCounter = 0;
+
                 @Override
                 public boolean hasNext()
                 {
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java
index afbb960e00a5..2d0ccb9d7e9c 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java
@@ -55,7 +55,7 @@ public static void testYield(
     Iterator<Integer> numsIter = nums.iterator();
     Yielder<Integer> yielder = seq.toYielder(
         0,
-        new YieldingAccumulator<Integer, Integer>()
+        new YieldingAccumulator<>()
         {
           final Iterator<Integer> valsIter = nums.iterator();
           int count = 0;
@@ -105,7 +105,7 @@ public static void testAccumulation(final String prefix, Sequence<Integer> seq,
 
     int sum = seq.accumulate(
         0,
-        new Accumulator<Integer, Integer>()
+        new Accumulator<>()
         {
           final Iterator<Integer> valsIter = nums.iterator();
 
@@ -144,7 +144,7 @@ public static void testClosed(AtomicInteger closedCounter, Sequence<Integer> seq
     try {
       yielder = seq.toYielder(
           1,
-          new YieldingAccumulator<Integer, Integer>()
+          new YieldingAccumulator<>()
           {
             @Override
             public Integer accumulate(Integer accumulated, Integer in)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/SkippingSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/SkippingSequenceTest.java
index 2b299d0b79ba..9f883e5b381e 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/SkippingSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/SkippingSequenceTest.java
@@ -79,7 +79,7 @@ public void testWithYieldingSequence()
   {
     // Create a Sequence whose Yielders will yield for each element, regardless of what the accumulator passed
     // to "toYielder" does.
-    final BaseSequence<Integer, Iterator<Integer>> sequence = new BaseSequence<Integer, Iterator<Integer>>(
+    final BaseSequence<Integer, Iterator<Integer>> sequence = new BaseSequence<>(
         new BaseSequence.IteratorMaker<Integer, Iterator<Integer>>()
         {
           @Override
@@ -104,7 +104,7 @@ public <OutType> Yielder<OutType> toYielder(
       {
         return super.toYielder(
             initValue,
-            new DelegatingYieldingAccumulator<OutType, Integer>(accumulator)
+            new DelegatingYieldingAccumulator<>(accumulator)
             {
               @Override
               public OutType accumulate(OutType accumulated, Integer in)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/parsers/CloseableIteratorTest.java b/processing/src/test/java/org/apache/druid/java/util/common/parsers/CloseableIteratorTest.java
index 3f701ee92f6f..fc9921a92499 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/parsers/CloseableIteratorTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/parsers/CloseableIteratorTest.java
@@ -163,7 +163,7 @@ public void testFlatMapInnerClose() throws IOException
 
   private static CloseableIterator<List<Integer>> generateTestIterator(int numIterates)
   {
-    return new CloseableIterator<List<Integer>>()
+    return new CloseableIterator<>()
     {
       private int cnt = 0;
 
diff --git a/processing/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java b/processing/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java
index 961a7226544d..b29f9186ff76 100644
--- a/processing/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java
+++ b/processing/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java
@@ -61,7 +61,7 @@ protected ListenableFuture<Response> go(Request request)
   static <T> ListenableFuture<T> immediateFuture(T val)
   {
     CompletableFuture<T> future = CompletableFuture.completedFuture(val);
-    return new ListenableFuture<T>()
+    return new ListenableFuture<>()
     {
       @Override
       public void done()
diff --git a/processing/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java b/processing/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java
index 2509db7a4b0a..e26c08d92b9e 100644
--- a/processing/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java
@@ -71,7 +71,7 @@ public void eventCountBased() throws InterruptedException, IOException
       final List<List<Batch>> eventBatchesPerThread = new ArrayList<>(nThreads);
       for (int i = 0; i < nThreads; i++) {
         eventsPerThread.add(new IntArrayList());
-        eventBatchesPerThread.add(new ArrayList<Batch>());
+        eventBatchesPerThread.add(new ArrayList<>());
       }
       for (int i = 0; i < N; i++) {
         eventsPerThread.get(ThreadLocalRandom.current().nextInt(nThreads)).add(i);
diff --git a/processing/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java b/processing/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java
index a8f1b196353c..68bebb61f02b 100644
--- a/processing/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java
@@ -169,7 +169,7 @@ public void testDefaulting()
 
   public Map<String, Object> contents(AlertEvent a)
   {
-    return Maps.filterKeys(a.toMap(), new Predicate<String>()
+    return Maps.filterKeys(a.toMap(), new Predicate<>()
     {
       @Override
       public boolean apply(String k)
diff --git a/processing/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java b/processing/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java
index 780cd12aa563..56e18f72823f 100644
--- a/processing/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java
@@ -158,7 +158,7 @@ public void testBlockingRead() throws Exception
     Assert.assertEquals(5, in.available());
 
     Future<byte[]> bytesFuture = Executors.newSingleThreadExecutor().submit(
-        new Callable<byte[]>()
+        new Callable<>()
         {
           @Override
           public byte[] call() throws Exception
@@ -218,7 +218,7 @@ public void testExceptionUnblocks() throws InterruptedException
     in.add(new byte[]{});
     in.add(new byte[]{1});
     in.add(new byte[]{});
-    final AtomicReference<IOException> exceptionThrown = new AtomicReference<IOException>();
+    final AtomicReference<IOException> exceptionThrown = new AtomicReference<>();
     final CountDownLatch latch = new CountDownLatch(1);
     Executors.newSingleThreadExecutor().submit(
         new Callable()
diff --git a/processing/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java b/processing/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java
index 2961f6504695..d9ab3ea919bd 100644
--- a/processing/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java
@@ -52,7 +52,7 @@ public void setUpPool(boolean eagerInitialization)
     resourceFactory = (ResourceFactory<String, String>) EasyMock.createMock(ResourceFactory.class);
 
     EasyMock.replay(resourceFactory);
-    pool = new ResourcePool<String, String>(
+    pool = new ResourcePool<>(
         resourceFactory,
         new ResourcePoolConfig(2, TimeUnit.MINUTES.toMillis(4)),
         eagerInitialization
@@ -418,7 +418,7 @@ public void testTimedOutResource() throws Exception
   {
     resourceFactory = (ResourceFactory<String, String>) EasyMock.createMock(ResourceFactory.class);
 
-    pool = new ResourcePool<String, String>(
+    pool = new ResourcePool<>(
         resourceFactory,
         new ResourcePoolConfig(2, TimeUnit.MILLISECONDS.toMillis(10)),
         true
diff --git a/processing/src/test/java/org/apache/druid/java/util/http/client/response/BytesFullResponseHolderTest.java b/processing/src/test/java/org/apache/druid/java/util/http/client/response/BytesFullResponseHolderTest.java
index fbabbb48d5a2..29c65f93aa25 100644
--- a/processing/src/test/java/org/apache/druid/java/util/http/client/response/BytesFullResponseHolderTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/http/client/response/BytesFullResponseHolderTest.java
@@ -52,8 +52,7 @@ public void testDeserialize() throws Exception
     final BytesFullResponseHolder target = spy(new BytesFullResponseHolder(response));
     target.addChunk(objectMapper.writeValueAsBytes(payload));
 
-    final ResponseObject deserialize = target.deserialize(objectMapper, new TypeReference<ResponseObject>() {
-    });
+    final ResponseObject deserialize = target.deserialize(objectMapper, new TypeReference<>() {});
 
     Assert.assertEquals(payload, deserialize);
     Mockito.verify(target, Mockito.times(1)).deserialize(ArgumentMatchers.any(), ArgumentMatchers.any());
diff --git a/processing/src/test/java/org/apache/druid/java/util/metrics/OshiSysMonitorTest.java b/processing/src/test/java/org/apache/druid/java/util/metrics/OshiSysMonitorTest.java
index d1c0f0ed1ba5..ece54cd3fa64 100644
--- a/processing/src/test/java/org/apache/druid/java/util/metrics/OshiSysMonitorTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/metrics/OshiSysMonitorTest.java
@@ -472,7 +472,7 @@ public void testCpuStats()
     m.stop();
     Assert.assertEquals(16, emitter.getEvents().size()); // 8 ticktype * 2 processors
 
-    Map<String, Object> userDims = new HashMap<String, Object>();
+    Map<String, Object> userDims = new HashMap<>();
     userDims.put("cpuName", "0");
     userDims.put("cpuTime", "user");
     List<Number> metricValues1 = emitter.getMetricValues("sys/cpu", userDims);
diff --git a/processing/src/test/java/org/apache/druid/math/expr/VectorExprSanityTest.java b/processing/src/test/java/org/apache/druid/math/expr/VectorExprSanityTest.java
index 2da11bb4e29c..ef7ab7fa4f85 100644
--- a/processing/src/test/java/org/apache/druid/math/expr/VectorExprSanityTest.java
+++ b/processing/src/test/java/org/apache/druid/math/expr/VectorExprSanityTest.java
@@ -478,7 +478,7 @@ public double getAsDouble()
           }
         },
         () -> ThreadLocalRandom.current().nextBoolean(),
-        new Supplier<String>()
+        new Supplier<>()
         {
           int counter = 1;
 
diff --git a/processing/src/test/java/org/apache/druid/metadata/MetadataStorageActionHandlerTest.java b/processing/src/test/java/org/apache/druid/metadata/MetadataStorageActionHandlerTest.java
index 41a0a55b284f..98d579821f6a 100644
--- a/processing/src/test/java/org/apache/druid/metadata/MetadataStorageActionHandlerTest.java
+++ b/processing/src/test/java/org/apache/druid/metadata/MetadataStorageActionHandlerTest.java
@@ -46,7 +46,7 @@ public class MetadataStorageActionHandlerTest
   @Before
   public void setup()
   {
-    this.handler = new MetadataStorageActionHandler<String, String, String, String>()
+    this.handler = new MetadataStorageActionHandler<>()
     {
       @Override
       public void insert(
diff --git a/processing/src/test/java/org/apache/druid/query/MultiValuedDimensionTest.java b/processing/src/test/java/org/apache/druid/query/MultiValuedDimensionTest.java
index a7abce4943c9..09a16932bcf9 100644
--- a/processing/src/test/java/org/apache/druid/query/MultiValuedDimensionTest.java
+++ b/processing/src/test/java/org/apache/druid/query/MultiValuedDimensionTest.java
@@ -1068,7 +1068,7 @@ public void testTopNWithDimFilterAndWithFilteredDimSpec()
       );
       Sequence<Result<TopNResultValue>> result = runner.run(QueryPlus.wrap(query));
       List<Result<TopNResultValue>> expectedResults = Collections.singletonList(
-          new Result<TopNResultValue>(
+          new Result<>(
               DateTimes.of("2011-01-12T00:00:00.000Z"),
               TopNResultValue.create(
                   Collections.<Map<String, Object>>singletonList(
@@ -1193,7 +1193,7 @@ public void testTopNExpressionAutoTransform()
               .build();
 
       List<Result<TopNResultValue>> expectedResults = Collections.singletonList(
-          new Result<TopNResultValue>(
+          new Result<>(
               DateTimes.of("2011-01-12T00:00:00.000Z"),
               TopNResultValue.create(
                   expected
diff --git a/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java b/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java
index 8361f6b0d32c..d270d53c015e 100644
--- a/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java
+++ b/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java
@@ -493,7 +493,7 @@ public static List<BiFunction<TemporaryFolder, Closer, List<Segment>>> getSegmen
   {
     final List<BiFunction<TemporaryFolder, Closer, List<Segment>>> segmentsGenerators =
         new ArrayList<>();
-    segmentsGenerators.add(new BiFunction<TemporaryFolder, Closer, List<Segment>>()
+    segmentsGenerators.add(new BiFunction<>()
     {
       @Override
       public List<Segment> apply(TemporaryFolder tempFolder, Closer closer)
@@ -522,7 +522,7 @@ public String toString()
         return MIX_SEGMENTS_NAME;
       }
     });
-    segmentsGenerators.add(new BiFunction<TemporaryFolder, Closer, List<Segment>>()
+    segmentsGenerators.add(new BiFunction<>()
     {
       @Override
       public List<Segment> apply(TemporaryFolder tempFolder, Closer closer)
@@ -544,7 +544,7 @@ public String toString()
         return INCREMENTAL_SEGMENTS_NAME;
       }
     });
-    segmentsGenerators.add(new BiFunction<TemporaryFolder, Closer, List<Segment>>()
+    segmentsGenerators.add(new BiFunction<>()
     {
       @Override
       public List<Segment> apply(TemporaryFolder tempFolder, Closer closer)
@@ -580,7 +580,7 @@ public String toString()
         return DEFAULT_SEGMENTS_NAME;
       }
     });
-    segmentsGenerators.add(new BiFunction<TemporaryFolder, Closer, List<Segment>>()
+    segmentsGenerators.add(new BiFunction<>()
     {
       @Override
       public List<Segment> apply(TemporaryFolder tempFolder, Closer closer)
diff --git a/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java b/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java
index 06954b8629ae..34a665829efb 100644
--- a/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java
+++ b/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java
@@ -123,7 +123,7 @@ public void tearDown()
   @Test
   public void testSubmit() throws Exception
   {
-    final ConcurrentLinkedQueue<Integer> order = new ConcurrentLinkedQueue<Integer>();
+    final ConcurrentLinkedQueue<Integer> order = new ConcurrentLinkedQueue<>();
 
     exec.submit(
         new AbstractPrioritizedCallable<Void>(0)
@@ -349,7 +349,7 @@ private PrioritizedCallable<Boolean> getCheckingPrioritizedCallable(
   )
   {
     final Callable<Boolean> delegate = getCheckingCallable(myOrder, hasRun);
-    return new AbstractPrioritizedCallable<Boolean>(priority)
+    return new AbstractPrioritizedCallable<>(priority)
     {
       @Override
       public Boolean call() throws Exception
@@ -365,7 +365,7 @@ private Callable<Boolean> getCheckingCallable(
   )
   {
     final Runnable runnable = getCheckingRunnable(myOrder, hasRun);
-    return new Callable<Boolean>()
+    return new Callable<>()
     {
       @Override
       public Boolean call()
diff --git a/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java b/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java
index 0a24a36cf74f..120ef503b8a0 100644
--- a/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java
@@ -335,13 +335,13 @@ public static Iterable<Object[]> transformToConstructionFeeder(Iterable<?> in)
   // simple cartesian iterable
   public static Iterable<Object[]> cartesian(final Iterable... iterables)
   {
-    return new Iterable<Object[]>()
+    return new Iterable<>()
     {
 
       @Override
       public Iterator<Object[]> iterator()
       {
-        return new Iterator<Object[]>()
+        return new Iterator<>()
         {
           private final Iterator[] iterators = new Iterator[iterables.length];
           private final Object[] cached = new Object[iterables.length];
diff --git a/processing/src/test/java/org/apache/druid/query/ResultGranularTimestampComparatorTest.java b/processing/src/test/java/org/apache/druid/query/ResultGranularTimestampComparatorTest.java
index 7edcca9a232a..08c1d5f4388d 100644
--- a/processing/src/test/java/org/apache/druid/query/ResultGranularTimestampComparatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/ResultGranularTimestampComparatorTest.java
@@ -53,8 +53,8 @@ public ResultGranularTimestampComparatorTest(boolean descending)
   @Test
   public void testCompareAll()
   {
-    Result<Object> r1 = new Result<Object>(time, null);
-    Result<Object> r2 = new Result<Object>(time.plusYears(5), null);
+    Result<Object> r1 = new Result<>(time, null);
+    Result<Object> r2 = new Result<>(time.plusYears(5), null);
 
     Assert.assertEquals(ResultGranularTimestampComparator.create(Granularities.ALL, descending).compare(r1, r2), 0);
   }
@@ -62,10 +62,10 @@ public void testCompareAll()
   @Test
   public void testCompareDay()
   {
-    Result<Object> res = new Result<Object>(time, null);
-    Result<Object> same = new Result<Object>(time.plusHours(12), null);
-    Result<Object> greater = new Result<Object>(time.plusHours(25), null);
-    Result<Object> less = new Result<Object>(time.minusHours(1), null);
+    Result<Object> res = new Result<>(time, null);
+    Result<Object> same = new Result<>(time.plusHours(12), null);
+    Result<Object> greater = new Result<>(time.plusHours(25), null);
+    Result<Object> less = new Result<>(time.minusHours(1), null);
 
     Granularity day = Granularities.DAY;
     Assert.assertEquals(ResultGranularTimestampComparator.create(day, descending).compare(res, same), 0);
@@ -76,10 +76,10 @@ public void testCompareDay()
   @Test
   public void testCompareHour()
   {
-    Result<Object> res = new Result<Object>(time, null);
-    Result<Object> same = new Result<Object>(time.plusMinutes(55), null);
-    Result<Object> greater = new Result<Object>(time.plusHours(1), null);
-    Result<Object> less = new Result<Object>(time.minusHours(1), null);
+    Result<Object> res = new Result<>(time, null);
+    Result<Object> same = new Result<>(time.plusMinutes(55), null);
+    Result<Object> greater = new Result<>(time.plusHours(1), null);
+    Result<Object> less = new Result<>(time.minusHours(1), null);
 
     Granularity hour = Granularities.HOUR;
     Assert.assertEquals(ResultGranularTimestampComparator.create(hour, descending).compare(res, same), 0);
diff --git a/processing/src/test/java/org/apache/druid/query/TimewarpOperatorTest.java b/processing/src/test/java/org/apache/druid/query/TimewarpOperatorTest.java
index 679501a25150..0563b98977b5 100644
--- a/processing/src/test/java/org/apache/druid/query/TimewarpOperatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/TimewarpOperatorTest.java
@@ -80,7 +80,7 @@ public void testComputeOffset()
   public void testPostProcess()
   {
     QueryRunner<Result<TimeseriesResultValue>> queryRunner = testOperator.postProcess(
-        new QueryRunner<Result<TimeseriesResultValue>>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<Result<TimeseriesResultValue>> run(
@@ -142,7 +142,7 @@ public Sequence<Result<TimeseriesResultValue>> run(
     );
 
     QueryRunner<Result<TimeBoundaryResultValue>> timeBoundaryRunner = timeBoundaryOperator.postProcess(
-        new QueryRunner<Result<TimeBoundaryResultValue>>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<Result<TimeBoundaryResultValue>> run(
@@ -189,7 +189,7 @@ public Sequence<Result<TimeBoundaryResultValue>> run(
   public void testPostProcessWithTimezonesAndDstShift()
   {
     QueryRunner<Result<TimeseriesResultValue>> queryRunner = testOperator.postProcess(
-        new QueryRunner<Result<TimeseriesResultValue>>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<Result<TimeseriesResultValue>> run(
@@ -249,7 +249,7 @@ public Sequence<Result<TimeseriesResultValue>> run(
   public void testPostProcessWithTimezonesAndNoDstShift()
   {
     QueryRunner<Result<TimeseriesResultValue>> queryRunner = testOperator.postProcess(
-        new QueryRunner<Result<TimeseriesResultValue>>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<Result<TimeseriesResultValue>> run(
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java b/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java
index c1d643d519ec..81f62cb7421c 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java
@@ -234,7 +234,7 @@ public static AggregationTestHelper createTopNQueryAggregationTestHelper(
 
     final CloseableStupidPool<ByteBuffer> pool = new CloseableStupidPool<>(
         "TopNQueryRunnerFactory-bufferPool",
-        new Supplier<ByteBuffer>()
+        new Supplier<>()
         {
           @Override
           public ByteBuffer get()
@@ -471,9 +471,7 @@ public void createIndex(
       LineIterator iter = IOUtils.lineIterator(inputDataStream, "UTF-8");
       List<AggregatorFactory> aggregatorSpecs = mapper.readValue(
           aggregators,
-          new TypeReference<List<AggregatorFactory>>()
-          {
-          }
+          new TypeReference<>() {}
       );
 
       createIndex(
@@ -673,7 +671,7 @@ public <T> Sequence<T> runQueryOnSegments(final List<File> segmentDirs, final Qu
   {
     final List<Segment> segments = Lists.transform(
         segmentDirs,
-        new Function<File, Segment>()
+        new Function<>()
         {
           @Override
           public Segment apply(File segmentDir)
@@ -743,7 +741,7 @@ public QueryRunner<ResultRow> makeStringSerdeQueryRunner(
       final QueryRunner<ResultRow> baseRunner
   )
   {
-    return new QueryRunner<ResultRow>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext map)
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerdeTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerdeTest.java
index 8dc5120958fb..f225b83b8553 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerdeTest.java
@@ -194,7 +194,7 @@ private static ByteBuffer serializeAllValuesToByteBuffer(
 
     final AtomicReference<SerializablePairLongDouble> reference = new AtomicReference<>(null);
     ColumnValueSelector<SerializablePairLongDouble> valueSelector =
-        new SingleObjectColumnValueSelector<SerializablePairLongDouble>(
+        new SingleObjectColumnValueSelector<>(
             SerializablePairLongDouble.class
         )
         {
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerdeTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerdeTest.java
index 1ca8c44d7be3..7fd74be211e8 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerdeTest.java
@@ -194,7 +194,7 @@ private static ByteBuffer serializeAllValuesToByteBuffer(
 
     final AtomicReference<SerializablePairLongFloat> reference = new AtomicReference<>(null);
     ColumnValueSelector<SerializablePairLongFloat> valueSelector =
-        new SingleObjectColumnValueSelector<SerializablePairLongFloat>(
+        new SingleObjectColumnValueSelector<>(
             SerializablePairLongFloat.class
         )
         {
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerdeTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerdeTest.java
index 3e03e05ee3bc..e54dd5e1d3f5 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerdeTest.java
@@ -194,7 +194,7 @@ private static ByteBuffer serializeAllValuesToByteBuffer(
 
     final AtomicReference<SerializablePairLongLong> reference = new AtomicReference<>(null);
     ColumnValueSelector<SerializablePairLongLong> valueSelector =
-        new SingleObjectColumnValueSelector<SerializablePairLongLong>(
+        new SingleObjectColumnValueSelector<>(
             SerializablePairLongLong.class
         )
         {
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerdeTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerdeTest.java
index b6ba96c1cece..7aeca212d62c 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerdeTest.java
@@ -205,7 +205,7 @@ private static ByteBuffer serializeAllValuesToByteBuffer(
 
     final AtomicReference<SerializablePairLongString> reference = new AtomicReference<>(null);
     ColumnValueSelector<SerializablePairLongString> valueSelector =
-        new SingleObjectColumnValueSelector<SerializablePairLongString>(
+        new SingleObjectColumnValueSelector<>(
             SerializablePairLongString.class
         )
         {
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java
index 3a306a6bd9e6..e5efa184c9da 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java
@@ -91,7 +91,7 @@ public TestDimensionSelector(Iterable<String[]> values, ExtractionFn exFn)
       this.column = Lists.newArrayList(
           Iterables.transform(
               values,
-              new Function<String[], Integer[]>()
+              new Function<>()
               {
                 @Nullable
                 @Override
@@ -229,7 +229,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
   private static List<String[]> dimensionValues(Object... values)
   {
     return Lists.transform(
-        Lists.newArrayList(values), new Function<Object, String[]>()
+        Lists.newArrayList(values), new Function<>()
         {
           @Nullable
           @Override
@@ -295,12 +295,12 @@ public CardinalityAggregatorTest()
     dim2 = new TestDimensionSelector(VALUES2, null);
 
     dimInfoList = Lists.newArrayList(
-        new ColumnSelectorPlus<CardinalityAggregatorColumnSelectorStrategy>(
+        new ColumnSelectorPlus<>(
             dimSpec1.getDimension(),
             dimSpec1.getOutputName(),
             new StringCardinalityAggregatorColumnSelectorStrategy(), dim1
         ),
-        new ColumnSelectorPlus<CardinalityAggregatorColumnSelectorStrategy>(
+        new ColumnSelectorPlus<>(
             dimSpec2.getDimension(),
             dimSpec2.getOutputName(),
             new StringCardinalityAggregatorColumnSelectorStrategy(), dim2
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java
index 5edc9773dd91..211df0de8c2d 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java
@@ -55,7 +55,7 @@ public void testCompute()
     agg.aggregate();
     agg.aggregate();
     agg.aggregate();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java
index 48477c1fa45d..60f3636300da 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java
@@ -51,7 +51,7 @@ public void testCompute()
     agg.aggregate();
     agg.aggregate();
     agg.aggregate();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
@@ -74,7 +74,7 @@ public void testComparator()
     final String aggName = "rows";
     DoubleGreatestPostAggregator greatestPostAggregator;
     CountAggregator agg = new CountAggregator();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java
index 96810fb0b945..87845d7d2e48 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java
@@ -51,7 +51,7 @@ public void testCompute()
     agg.aggregate();
     agg.aggregate();
     agg.aggregate();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
@@ -74,7 +74,7 @@ public void testComparator()
     final String aggName = "rows";
     DoubleLeastPostAggregator leastPostAggregator;
     CountAggregator agg = new CountAggregator();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
index d80eb106b82b..f477b5db5ab9 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
@@ -87,7 +87,7 @@ public void testCompute()
 
     fieldAccessPostAggregator = new FieldAccessPostAggregator("To be, or not to be, that is the question:", "rows");
     CountAggregator agg = new CountAggregator();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
     Assert.assertEquals(new Long(0L), fieldAccessPostAggregator.compute(metricValues));
 
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java
index 5f93b09359a8..34902b0bc1c1 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java
@@ -51,7 +51,7 @@ public void testCompute()
     agg.aggregate();
     agg.aggregate();
     agg.aggregate();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
@@ -74,7 +74,7 @@ public void testComparator()
     final String aggName = "rows";
     LongGreatestPostAggregator greatestPostAggregator;
     CountAggregator agg = new CountAggregator();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregatorTest.java
index b97b52b5183a..af58830b3eee 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregatorTest.java
@@ -51,7 +51,7 @@ public void testCompute()
     agg.aggregate();
     agg.aggregate();
     agg.aggregate();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
@@ -74,7 +74,7 @@ public void testComparator()
     final String aggName = "rows";
     LongLeastPostAggregator leastPostAggregator;
     CountAggregator agg = new CountAggregator();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
diff --git a/processing/src/test/java/org/apache/druid/query/dimension/LegacyDimensionSpecTest.java b/processing/src/test/java/org/apache/druid/query/dimension/LegacyDimensionSpecTest.java
index aaf6aece9f59..0c68146dfaeb 100644
--- a/processing/src/test/java/org/apache/druid/query/dimension/LegacyDimensionSpecTest.java
+++ b/processing/src/test/java/org/apache/druid/query/dimension/LegacyDimensionSpecTest.java
@@ -38,9 +38,7 @@ public void testEqualsSerde() throws IOException
   {
     final String dimension = "testDimension";
     final List<DimensionSpec> deserializedSpecs = mapper.readValue(
-        StringUtils.format("[\"%s\"]", dimension), new TypeReference<List<DimensionSpec>>()
-        {
-        }
+        StringUtils.format("[\"%s\"]", dimension), new TypeReference<>() {}
     );
     Assert.assertEquals(dimension, deserializedSpecs.get(0).getDimension());
     Assert.assertEquals(dimension, deserializedSpecs.get(0).getOutputName());
diff --git a/processing/src/test/java/org/apache/druid/query/explain/ExplainPlanTest.java b/processing/src/test/java/org/apache/druid/query/explain/ExplainPlanTest.java
index 7ff56b7c6fd9..0273ec412851 100644
--- a/processing/src/test/java/org/apache/druid/query/explain/ExplainPlanTest.java
+++ b/processing/src/test/java/org/apache/druid/query/explain/ExplainPlanTest.java
@@ -110,7 +110,7 @@ private void testSerde(
     try {
       observedExplainPlans = MAPPER.readValue(
           MAPPER.writeValueAsString(givenPlans),
-          new TypeReference<List<ExplainPlan>>() {}
+          new TypeReference<>() {}
       );
     }
     catch (Exception e) {
diff --git a/processing/src/test/java/org/apache/druid/query/extraction/FunctionalExtractionTest.java b/processing/src/test/java/org/apache/druid/query/extraction/FunctionalExtractionTest.java
index c00ac686c57b..a4e4c9feef7a 100644
--- a/processing/src/test/java/org/apache/druid/query/extraction/FunctionalExtractionTest.java
+++ b/processing/src/test/java/org/apache/druid/query/extraction/FunctionalExtractionTest.java
@@ -52,7 +52,7 @@ public byte[] getCacheKey()
     }
   }
 
-  private static final Function<String, String> NULL_FN = new Function<String, String>()
+  private static final Function<String, String> NULL_FN = new Function<>()
   {
     @Nullable
     @Override
@@ -62,7 +62,7 @@ public String apply(String input)
     }
   };
 
-  private static final Function<String, String> TURTLE_FN = new Function<String, String>()
+  private static final Function<String, String> TURTLE_FN = new Function<>()
   {
     @Nullable
     @Override
@@ -72,7 +72,7 @@ public String apply(@Nullable String input)
     }
   };
 
-  private static final Function<String, String> EMPTY_STR_FN = new Function<String, String>()
+  private static final Function<String, String> EMPTY_STR_FN = new Function<>()
   {
     @Nullable
     @Override
@@ -82,7 +82,7 @@ public String apply(@Nullable String input)
     }
   };
 
-  private static final Function<String, String> IDENTITY_FN = new Function<String, String>()
+  private static final Function<String, String> IDENTITY_FN = new Function<>()
   {
     @Nullable
     @Override
@@ -92,7 +92,7 @@ public String apply(@Nullable String input)
     }
   };
 
-  private static final Function<String, String> ONLY_PRESENT = new Function<String, String>()
+  private static final Function<String, String> ONLY_PRESENT = new Function<>()
   {
     @Nullable
     @Override
diff --git a/processing/src/test/java/org/apache/druid/query/filter/DimFilterUtilsTest.java b/processing/src/test/java/org/apache/druid/query/filter/DimFilterUtilsTest.java
index 13e15891d2f3..179abe02121d 100644
--- a/processing/src/test/java/org/apache/druid/query/filter/DimFilterUtilsTest.java
+++ b/processing/src/test/java/org/apache/druid/query/filter/DimFilterUtilsTest.java
@@ -41,7 +41,7 @@
 
 public class DimFilterUtilsTest
 {
-  private static final Function<ShardSpec, ShardSpec> CONVERTER = new Function<ShardSpec, ShardSpec>()
+  private static final Function<ShardSpec, ShardSpec> CONVERTER = new Function<>()
   {
     @Nullable
     @Override
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java
index 6fb14ef6707b..b2c723a0fe27 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java
@@ -412,7 +412,7 @@ public void testPartialLimitPushDownMerge()
 
     QueryRunner<ResultRow> theRunner3 = new FinalizeResultsQueryRunner<>(
         toolChest.mergeResults(
-            new QueryRunner<ResultRow>()
+            new QueryRunner<>()
             {
               @Override
               public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -515,7 +515,7 @@ public void testPartialLimitPushDownMergeForceAggs()
 
     QueryRunner<ResultRow> theRunner3 = new FinalizeResultsQueryRunner<>(
         toolChest.mergeResults(
-            new QueryRunner<ResultRow>()
+            new QueryRunner<>()
             {
               @Override
               public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java
index 8daa143db4cb..116e3b811748 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java
@@ -677,7 +677,7 @@ public void testDescendingNumerics()
 
     QueryRunner<ResultRow> finalRunner = new FinalizeResultsQueryRunner<>(
         toolChestBroker.mergeResults(
-            new QueryRunner<ResultRow>()
+            new QueryRunner<>()
             {
               @Override
               public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -823,7 +823,7 @@ public void testPartialLimitPushDownMerge()
 
     QueryRunner<ResultRow> finalRunner = new FinalizeResultsQueryRunner<>(
         toolchestBroker.mergeResults(
-            new QueryRunner<ResultRow>()
+            new QueryRunner<>()
             {
               @Override
               public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -972,7 +972,7 @@ private List<ResultRow> testForcePushLimitDownAccuracyWhenSortHasNonGroupingFiel
     QueryToolChest<ResultRow, GroupByQuery> toolchestBroker = groupByFactoryBroker.getToolchest();
     QueryRunner<ResultRow> finalRunner = new FinalizeResultsQueryRunner<>(
         toolchestBroker.mergeResults(
-            new QueryRunner<ResultRow>()
+            new QueryRunner<>()
             {
               @Override
               public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java
index f8107245c93b..13e0702f3ef8 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java
@@ -3889,7 +3889,7 @@ public void testMergeResults()
     final GroupByQuery allGranQuery = builder.copy().setGranularity(Granularities.ALL).build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -4253,7 +4253,7 @@ private void doTestMergeResultsWithOrderBy(
   )
   {
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -5070,7 +5070,7 @@ public void testPostAggMergedHavingSpec()
     );
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -5535,7 +5535,7 @@ public void testMergedHavingSpec()
     );
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -5626,7 +5626,7 @@ public void testMergedPostAggHavingSpec()
     );
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -11673,7 +11673,7 @@ public void testMergeResultsWithLimitPushDown()
     final GroupByQuery allGranQuery = builder.build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -11739,7 +11739,7 @@ public void testMergeResultsWithLimitPushDownSortByAgg()
     final GroupByQuery allGranQuery = builder.build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -11806,7 +11806,7 @@ public void testMergeResultsWithLimitPushDownSortByAggWithOffset()
     final GroupByQuery allGranQuery = builder.build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -11880,7 +11880,7 @@ public void testMergeResultsWithLimitPushDownSortByDimDim()
     final GroupByQuery allGranQuery = builder.build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -11964,7 +11964,7 @@ public void testMergeResultsWithLimitPushDownSortByDimAggDim()
     final GroupByQuery allGranQuery = builder.build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java
index 1a06e725aead..a67479f7c222 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java
@@ -206,7 +206,7 @@ private ResourceHolder<Grouper<IntKey>> makeGrouper(
 
     grouper.init();
 
-    return new ResourceHolder<Grouper<IntKey>>()
+    return new ResourceHolder<>()
     {
       @Override
       public BufferHashGrouper<IntKey> get()
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java
index 8a06eb6b0252..50e01b0f60c7 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java
@@ -127,7 +127,7 @@ public ConcurrentGrouperTest(
     this.concurrencyHint = concurrencyHint;
     this.parallelCombineThreads = parallelCombineThreads;
     this.mergeThreadLocal = mergeThreadLocal;
-    this.bufferSupplier = new Supplier<ByteBuffer>()
+    this.bufferSupplier = new Supplier<>()
     {
       private final AtomicBoolean called = new AtomicBoolean(false);
       private ByteBuffer buffer;
@@ -368,7 +368,7 @@ public long getMaxDictionarySize()
     @Override
     public KeySerde<LongKey> factorize()
     {
-      return new KeySerde<LongKey>()
+      return new KeySerde<>()
       {
         final ByteBuffer buffer = ByteBuffer.allocate(8);
 
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/GroupByTestColumnSelectorFactory.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/GroupByTestColumnSelectorFactory.java
index e6b2dbd8364f..d602ada4f86a 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/GroupByTestColumnSelectorFactory.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/GroupByTestColumnSelectorFactory.java
@@ -47,7 +47,7 @@ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec)
   @Override
   public ColumnValueSelector<?> makeColumnValueSelector(String columnName)
   {
-    return new ColumnValueSelector<Object>()
+    return new ColumnValueSelector<>()
     {
       @Override
       public double getDouble()
diff --git a/processing/src/test/java/org/apache/druid/query/lookup/LookupsStateTest.java b/processing/src/test/java/org/apache/druid/query/lookup/LookupsStateTest.java
index f54efca38985..5bcec0140cf4 100644
--- a/processing/src/test/java/org/apache/druid/query/lookup/LookupsStateTest.java
+++ b/processing/src/test/java/org/apache/druid/query/lookup/LookupsStateTest.java
@@ -55,9 +55,7 @@ public void testSerde() throws Exception
                      + "}";
 
     TypeReference<LookupsState<LookupExtractorFactoryContainer>> typeRef =
-        new TypeReference<LookupsState<LookupExtractorFactoryContainer>>()
-        {
-        };
+        new TypeReference<>() {};
 
     final ObjectMapper mapper = new DefaultObjectMapper();
     mapper.registerSubtypes(LookupExtractorFactoryContainerTest.TestLookupExtractorFactory.class);
diff --git a/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
index af17379367ed..04a53908b484 100644
--- a/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
@@ -1012,7 +1012,7 @@ public void testSegmentMetadataQueryWithQueryGranularityMerge()
   @Test
   public void testBySegmentResults()
   {
-    Result<BySegmentResultValue> bySegmentResult = new Result<BySegmentResultValue>(
+    Result<BySegmentResultValue> bySegmentResult = new Result<>(
         expectedSegmentAnalysis1.getIntervals().get(0).getStart(),
         new BySegmentResultValueClass(
             Collections.singletonList(
diff --git a/processing/src/test/java/org/apache/druid/query/operator/OperatorSequenceTest.java b/processing/src/test/java/org/apache/druid/query/operator/OperatorSequenceTest.java
index a1b5e9f1aea3..cad76a471780 100644
--- a/processing/src/test/java/org/apache/druid/query/operator/OperatorSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/query/operator/OperatorSequenceTest.java
@@ -54,7 +54,7 @@ public void testAccumulateAndYielderJustOne()
         ).intValue()
     );
 
-    Yielder<Integer> yielder = seq.toYielder(0, new YieldingAccumulator<Integer, RowsAndColumns>()
+    Yielder<Integer> yielder = seq.toYielder(0, new YieldingAccumulator<>()
     {
       @Override
       public Integer accumulate(Integer accumulated, RowsAndColumns in)
@@ -101,7 +101,7 @@ public void testAccumulateAndYielderMultiple()
     );
 
     // Never yield
-    Yielder<Integer> yielder = seq.toYielder(0, new YieldingAccumulator<Integer, RowsAndColumns>()
+    Yielder<Integer> yielder = seq.toYielder(0, new YieldingAccumulator<>()
     {
       @Override
       public Integer accumulate(Integer accumulated, RowsAndColumns in)
@@ -118,7 +118,7 @@ public Integer accumulate(Integer accumulated, RowsAndColumns in)
     Assert.assertTrue(yielder.isDone());
 
     // Yield at the very end...
-    yielder = seq.toYielder(0, new YieldingAccumulator<Integer, RowsAndColumns>()
+    yielder = seq.toYielder(0, new YieldingAccumulator<>()
     {
       @Override
       public Integer accumulate(Integer accumulated, RowsAndColumns in)
@@ -141,7 +141,7 @@ public Integer accumulate(Integer accumulated, RowsAndColumns in)
     Assert.assertTrue(yielder.isDone());
 
     // Aggregate each RAC and yield every other.
-    yielder = seq.toYielder(0, new YieldingAccumulator<Integer, RowsAndColumns>()
+    yielder = seq.toYielder(0, new YieldingAccumulator<>()
     {
       @Override
       public Integer accumulate(Integer accumulated, RowsAndColumns in)
diff --git a/processing/src/test/java/org/apache/druid/query/rowsandcols/RearrangedRowsAndColumnsTest.java b/processing/src/test/java/org/apache/druid/query/rowsandcols/RearrangedRowsAndColumnsTest.java
index cb75c656775d..35e95ed551ca 100644
--- a/processing/src/test/java/org/apache/druid/query/rowsandcols/RearrangedRowsAndColumnsTest.java
+++ b/processing/src/test/java/org/apache/druid/query/rowsandcols/RearrangedRowsAndColumnsTest.java
@@ -64,7 +64,7 @@ public RearrangedRowsAndColumnsTest()
   @SuppressWarnings("UnusedCollectionModifiedInPlace")
   private static void shuffleArray(int[] pointers)
   {
-    Collections.shuffle(new AbstractList<Object>()
+    Collections.shuffle(new AbstractList<>()
     {
       @Override
       public Object get(int index)
diff --git a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryResultOrderingTest.java b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryResultOrderingTest.java
index 776f89cc8b5b..9c507cdcc8dc 100644
--- a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryResultOrderingTest.java
+++ b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryResultOrderingTest.java
@@ -323,7 +323,7 @@ private void assertResultsEquals(final ScanQuery query, final List<Integer> expe
                      .map(
                          runners ->
                              queryRunnerFactory.getToolchest().mergeResults(
-                                 new QueryRunner<ScanResultValue>()
+                                 new QueryRunner<>()
                                  {
                                    @Override
                                    public Sequence<ScanResultValue> run(
diff --git a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryRunnerTest.java
index 7d88d5decfa6..365fdbb465d1 100644
--- a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryRunnerTest.java
@@ -103,7 +103,7 @@ private static List<String> readLinesFromSample(
     List<String> lines = new ArrayList<>();
     try {
       sampleData.readLines(
-          new LineProcessor<Object>()
+          new LineProcessor<>()
           {
             int count = 0;
 
@@ -1155,7 +1155,7 @@ private static Iterable<ScanResultValue> populateNullColumnAtLastForQueryableInd
 
   private Iterable<ScanResultValue> compactedListToRow(Iterable<ScanResultValue> results)
   {
-    return Lists.newArrayList(Iterables.transform(results, new Function<ScanResultValue, ScanResultValue>()
+    return Lists.newArrayList(Iterables.transform(results, new Function<>()
     {
       @Override
       public ScanResultValue apply(ScanResultValue input)
diff --git a/processing/src/test/java/org/apache/druid/query/search/SearchBinaryFnTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchBinaryFnTest.java
index a48fc66506e2..2aa2588406e2 100644
--- a/processing/src/test/java/org/apache/druid/query/search/SearchBinaryFnTest.java
+++ b/processing/src/test/java/org/apache/druid/query/search/SearchBinaryFnTest.java
@@ -57,7 +57,7 @@ private void assertSearchMergeResult(SearchResultValue o1, SearchResultValue o2)
   @Test
   public void testMerge()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -69,7 +69,7 @@ public void testMerge()
         )
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -81,7 +81,7 @@ public void testMerge()
         )
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -105,7 +105,7 @@ public void testMerge()
   @Test
   public void testMergeDay()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -117,7 +117,7 @@ public void testMergeDay()
         )
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -129,7 +129,7 @@ public void testMergeDay()
         )
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         Granularities.DAY.bucketStart(currTime),
         new SearchResultValue(
             ImmutableList.of(
@@ -153,7 +153,7 @@ public void testMergeDay()
   @Test
   public void testMergeOneResultNull()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -177,7 +177,7 @@ public void testMergeOneResultNull()
   @Test
   public void testMergeShiftedTimestamp()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -189,7 +189,7 @@ public void testMergeShiftedTimestamp()
         )
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime.plusHours(2),
         new SearchResultValue(
             ImmutableList.of(
@@ -201,7 +201,7 @@ public void testMergeShiftedTimestamp()
         )
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -228,17 +228,17 @@ public void testStrlenMerge()
     SearchSortSpec searchSortSpec = new SearchSortSpec(StringComparators.STRLEN);
     Comparator<SearchHit> c = searchSortSpec.getComparator();
 
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:thisislong"))
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:short"))
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:short", "blah:thisislong"))
     );
@@ -254,17 +254,17 @@ public void testStrlenMerge2()
     SearchSortSpec searchSortSpec = new SearchSortSpec(StringComparators.STRLEN);
     Comparator<SearchHit> c = searchSortSpec.getComparator();
 
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:short", "blah:thisislong", "blah2:thisislong"))
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:short", "blah2:thisislong"))
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:short", "blah:thisislong", "blah2:thisislong"))
     );
@@ -280,17 +280,17 @@ public void testAlphanumericMerge()
     SearchSortSpec searchSortSpec = new SearchSortSpec(StringComparators.ALPHANUMERIC);
     Comparator<SearchHit> c = searchSortSpec.getComparator();
 
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:a100", "blah:a9", "alah:a100"))
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:b0", "alah:c3"))
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:a9", "alah:a100", "blah:a100", "blah:b0", "alah:c3"))
     );
@@ -319,7 +319,7 @@ private List<SearchHit> toHits(Comparator<SearchHit> comparator, String... hits)
   @Test
   public void testMergeUniqueResults()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -343,7 +343,7 @@ public void testMergeUniqueResults()
   @Test
   public void testMergeLimit()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -355,7 +355,7 @@ public void testMergeLimit()
         )
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -375,7 +375,7 @@ public void testMergeLimit()
   @Test
   public void testMergeCountWithNull()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
             currTime,
             new SearchResultValue(
                     ImmutableList.of(
@@ -387,7 +387,7 @@ public void testMergeCountWithNull()
             )
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
             currTime,
             new SearchResultValue(
                     ImmutableList.of(
diff --git a/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java
index 8e6156dbe761..b38283662c02 100644
--- a/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java
@@ -166,7 +166,7 @@ public void testSearchWithCardinality()
 
     // double the value
     QueryRunner mergedRunner = TOOL_CHEST.mergeResults(
-        new QueryRunner<Result<SearchResultValue>>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<Result<SearchResultValue>> run(
diff --git a/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesBinaryFnTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesBinaryFnTest.java
index 3442b11509a6..0cd3df176bbb 100644
--- a/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesBinaryFnTest.java
+++ b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesBinaryFnTest.java
@@ -48,7 +48,7 @@ public class TimeseriesBinaryFnTest
   @Test
   public void testMerge()
   {
-    Result<TimeseriesResultValue> result1 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result1 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -57,7 +57,7 @@ public void testMerge()
             )
         )
     );
-    Result<TimeseriesResultValue> result2 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result2 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -67,7 +67,7 @@ public void testMerge()
         )
     );
 
-    Result<TimeseriesResultValue> expected = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> expected = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -90,7 +90,7 @@ public void testMerge()
   @Test
   public void testMergeDay()
   {
-    Result<TimeseriesResultValue> result1 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result1 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -99,7 +99,7 @@ public void testMergeDay()
             )
         )
     );
-    Result<TimeseriesResultValue> result2 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result2 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -109,7 +109,7 @@ public void testMergeDay()
         )
     );
 
-    Result<TimeseriesResultValue> expected = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> expected = new Result<>(
         Granularities.DAY.bucketStart(currTime),
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -132,7 +132,7 @@ public void testMergeDay()
   @Test
   public void testMergeOneNullResult()
   {
-    Result<TimeseriesResultValue> result1 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result1 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -158,7 +158,7 @@ public void testMergeOneNullResult()
   @Test
   public void testMergeShiftedTimestamp()
   {
-    Result<TimeseriesResultValue> result1 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result1 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -167,7 +167,7 @@ public void testMergeShiftedTimestamp()
             )
         )
     );
-    Result<TimeseriesResultValue> result2 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result2 = new Result<>(
         currTime.plusHours(2),
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -177,7 +177,7 @@ public void testMergeShiftedTimestamp()
         )
     );
 
-    Result<TimeseriesResultValue> expected = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> expected = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
diff --git a/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java
index 9c89d6308525..a2a85b2fc6f8 100644
--- a/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java
@@ -223,7 +223,7 @@ public void testFullOnTimeseries()
 
     StubServiceEmitter stubServiceEmitter = new StubServiceEmitter("", "");
     MetricsEmittingQueryRunner<Result<TimeseriesResultValue>> metricsEmittingQueryRunner =
-        new MetricsEmittingQueryRunner<Result<TimeseriesResultValue>>(
+        new MetricsEmittingQueryRunner<>(
             stubServiceEmitter,
             new TimeseriesQueryQueryToolChest(),
             runner,
diff --git a/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnTest.java b/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnTest.java
index c834b24b2c80..b024b681189b 100644
--- a/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnTest.java
+++ b/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnTest.java
@@ -81,7 +81,7 @@ private void assertTopNMergeResult(Object o1, Object o2)
   @Test
   public void testMerge()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -103,7 +103,7 @@ public void testMerge()
             )
         )
     );
-    Result<TopNResultValue> result2 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result2 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -126,7 +126,7 @@ public void testMerge()
         )
     );
 
-    Result<TopNResultValue> expected = new Result<TopNResultValue>(
+    Result<TopNResultValue> expected = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -163,7 +163,7 @@ public void testMerge()
   @Test
   public void testMergeDay()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -185,7 +185,7 @@ public void testMergeDay()
             )
         )
     );
-    Result<TopNResultValue> result2 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result2 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -208,7 +208,7 @@ public void testMergeDay()
         )
     );
 
-    Result<TopNResultValue> expected = new Result<TopNResultValue>(
+    Result<TopNResultValue> expected = new Result<>(
         Granularities.DAY.bucketStart(currTime),
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -244,7 +244,7 @@ public void testMergeDay()
   @Test
   public void testMergeOneResultNull()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -288,7 +288,7 @@ public void testMergeOneResultNull()
   @Test
   public void testMergeByPostAgg()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -313,7 +313,7 @@ public void testMergeByPostAgg()
             )
         )
     );
-    Result<TopNResultValue> result2 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result2 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -339,7 +339,7 @@ public void testMergeByPostAgg()
         )
     );
 
-    Result<TopNResultValue> expected = new Result<TopNResultValue>(
+    Result<TopNResultValue> expected = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -383,7 +383,7 @@ public void testMergeByPostAgg()
   @Test
   public void testMergeShiftedTimestamp()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -405,7 +405,7 @@ public void testMergeShiftedTimestamp()
             )
         )
     );
-    Result<TopNResultValue> result2 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result2 = new Result<>(
         currTime.plusHours(2),
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -428,7 +428,7 @@ public void testMergeShiftedTimestamp()
         )
     );
 
-    Result<TopNResultValue> expected = new Result<TopNResultValue>(
+    Result<TopNResultValue> expected = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -464,7 +464,7 @@ public void testMergeShiftedTimestamp()
   @Test
   public void testMergeLexicographicWithInvalidDimName()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -476,7 +476,7 @@ public void testMergeLexicographicWithInvalidDimName()
             )
         )
     );
-    Result<TopNResultValue> result2 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result2 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -494,7 +494,7 @@ public void testMergeLexicographicWithInvalidDimName()
     resultMap.put("rows", 3L);
     resultMap.put("index", 5L);
 
-    Result<TopNResultValue> expected = new Result<TopNResultValue>(
+    Result<TopNResultValue> expected = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.of(
diff --git a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java
index cf8a3eb6e2e7..07431ffc077a 100644
--- a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java
+++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java
@@ -83,9 +83,9 @@ public enum TestCases
   public static void setUp()
   {
     QueryRunnerFactory factory = new TopNQueryRunnerFactory(
-        new StupidPool<ByteBuffer>(
+        new StupidPool<>(
             "TopNQueryRunnerFactory-directBufferPool",
-            new Supplier<ByteBuffer>()
+            new Supplier<>()
             {
               @Override
               public ByteBuffer get()
diff --git a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
index 285ccf31a60e..42d8a72a0a03 100644
--- a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
@@ -1172,7 +1172,7 @@ public void testTopNOverFirstLastFloatAggregatorUsingFloatColumn()
   public void testTopNBySegment()
   {
 
-    final HashMap<String, Object> specialContext = new HashMap<String, Object>();
+    final HashMap<String, Object> specialContext = new HashMap<>();
     specialContext.put(QueryContexts.BY_SEGMENT_KEY, "true");
     TopNQuery query = new TopNQueryBuilder()
         .dataSource(QueryRunnerTestHelper.DATA_SOURCE)
diff --git a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTestHelper.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTestHelper.java
index fb783c74432e..2017fc0d5656 100644
--- a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTestHelper.java
@@ -43,6 +43,6 @@ public static Result<TopNResultValue> createExpectedRows(String date, String[] c
       }
       expected.add(theVals);
     }
-    return new Result<TopNResultValue>(DateTimes.of(date), TopNResultValue.create(expected));
+    return new Result<>(DateTimes.of(date), TopNResultValue.create(expected));
   }
 }
diff --git a/processing/src/test/java/org/apache/druid/query/union/UnionQueryQueryToolChestTest.java b/processing/src/test/java/org/apache/druid/query/union/UnionQueryQueryToolChestTest.java
index fbb8a9d358de..295b34b4b2b0 100644
--- a/processing/src/test/java/org/apache/druid/query/union/UnionQueryQueryToolChestTest.java
+++ b/processing/src/test/java/org/apache/druid/query/union/UnionQueryQueryToolChestTest.java
@@ -112,7 +112,7 @@ public void testResultArraySignatureWithTimestampResultField()
   static class TestScanQuery
   {
     final ScanQuery query;
-    final List<Object[]> results = new ArrayList<Object[]>();
+    final List<Object[]> results = new ArrayList<>();
 
     public TestScanQuery(String sourceName, RowSignature signature)
     {
@@ -143,7 +143,7 @@ public Sequence<ScanResultValue> makeResultSequence()
 
     private List<List<Object>> convertResultsToListOfLists()
     {
-      List<List<Object>> resultsRows = new ArrayList<List<Object>>();
+      List<List<Object>> resultsRows = new ArrayList<>();
       for (Object[] objects : results) {
         resultsRows.add(Arrays.asList(objects));
       }
diff --git a/processing/src/test/java/org/apache/druid/segment/CursorFactoryProjectionTest.java b/processing/src/test/java/org/apache/druid/segment/CursorFactoryProjectionTest.java
index b2236a1fabdd..7ddf086eb5a0 100644
--- a/processing/src/test/java/org/apache/druid/segment/CursorFactoryProjectionTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/CursorFactoryProjectionTest.java
@@ -1238,7 +1238,7 @@ private static IndexBuilder makeBuilder(DimensionsSpec dimensionsSpec, boolean a
   private static Set<Object[]> makeArrayResultSet()
   {
     Set<Object[]> resultsInNoParticularOrder = new ObjectOpenCustomHashSet<>(
-        new Hash.Strategy<Object[]>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(Object[] o)
diff --git a/processing/src/test/java/org/apache/druid/segment/DictionaryMergingIteratorTest.java b/processing/src/test/java/org/apache/druid/segment/DictionaryMergingIteratorTest.java
index e8a8a9ba7127..a97fe8c998eb 100644
--- a/processing/src/test/java/org/apache/druid/segment/DictionaryMergingIteratorTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/DictionaryMergingIteratorTest.java
@@ -38,11 +38,11 @@ public void basicTest()
     String[] s3 = {"a", "d", "f"};        // 0 3 5
     String[] s4 = {"a", "b", "c"};
     String[] s5 = {"a", "b", "c", "d", "e", "f"};
-    Indexed<String> i1 = new ListIndexed<String>(s1);
-    Indexed<String> i2 = new ListIndexed<String>(s2);
-    Indexed<String> i3 = new ListIndexed<String>(s3);
-    Indexed<String> i4 = new ListIndexed<String>(s4);
-    Indexed<String> i5 = new ListIndexed<String>(s5);
+    Indexed<String> i1 = new ListIndexed<>(s1);
+    Indexed<String> i2 = new ListIndexed<>(s2);
+    Indexed<String> i3 = new ListIndexed<>(s3);
+    Indexed<String> i4 = new ListIndexed<>(s4);
+    Indexed<String> i5 = new ListIndexed<>(s5);
 
     DictionaryMergingIterator<String> iterator = new DictionaryMergingIterator<>(
         new Indexed[]{i1, i2, i3, i4, i5},
diff --git a/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java b/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java
index 03fac9ebcfdc..e755df26822a 100644
--- a/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java
@@ -120,7 +120,7 @@ public static Iterable<Object[]> constructionFeeder()
               @Override
               public Iterator<Iterable<Object[]>> iterator()
               {
-                return new Iterator<Iterable<Object[]>>()
+                return new Iterator<>()
                 {
                   long nextBitset = 1L;
 
@@ -136,7 +136,7 @@ public Iterable<Object[]> next()
                     final BitSet bitset = BitSet.valueOf(new long[]{nextBitset++});
                     final List<Map<String, Object>> myMaps = filterByBitset(maps, bitset);
                     return Collections2.transform(
-                        Collections2.permutations(myMaps), new Function<List<Map<String, Object>>, Object[]>()
+                        Collections2.permutations(myMaps), new Function<>()
                         {
                           @Nullable
                           @Override
@@ -164,7 +164,7 @@ public void remove()
               @Override
               public Iterator<Iterable<Object[]>> iterator()
               {
-                return new Iterator<Iterable<Object[]>>()
+                return new Iterator<>()
                 {
                   long nextMap1Bits = 1L;
 
@@ -179,12 +179,12 @@ public Iterable<Object[]> next()
                   {
                     final BitSet bitset1 = BitSet.valueOf(new long[]{nextMap1Bits++});
                     final List<Map<String, Object>> maplist1 = filterByBitset(maps, bitset1);
-                    return new Iterable<Object[]>()
+                    return new Iterable<>()
                     {
                       @Override
                       public Iterator<Object[]> iterator()
                       {
-                        return new Iterator<Object[]>()
+                        return new Iterator<>()
                         {
                           long nextMap2Bits = 1L;
 
diff --git a/processing/src/test/java/org/apache/druid/segment/RowBasedCursorFactoryTest.java b/processing/src/test/java/org/apache/druid/segment/RowBasedCursorFactoryTest.java
index aab86309eaa5..9c5e79ae95e5 100644
--- a/processing/src/test/java/org/apache/druid/segment/RowBasedCursorFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/RowBasedCursorFactoryTest.java
@@ -180,7 +180,7 @@ public static void setUpClass()
    * other columns return null.
    */
   private static final RowAdapter<Integer> ROW_ADAPTER =
-      new RowAdapter<Integer>()
+      new RowAdapter<>()
       {
         @Override
         public ToLongFunction<Integer> timestampFunction()
@@ -209,9 +209,10 @@ public Function<Integer, Object> columnFunction(String columnName)
       };
 
   private static final RowAdapter<Integer> SAME_TIME_ROW_ADAPTER =
-      new RowAdapter<Integer>()
+      new RowAdapter<>()
       {
         private DateTime startTime = DateTimes.nowUtc();
+
         @Override
         public ToLongFunction<Integer> timestampFunction()
         {
diff --git a/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
index 220baec27b77..b7810d8a1b17 100644
--- a/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
@@ -310,8 +310,8 @@ public QueryableIndex getMergedIncrementalIndexDiffMetrics()
   {
     return getMergedIncrementalIndex(
         Arrays.asList(
-            new Pair<String, AggregatorFactory[]>("druid.sample.json.top", METRIC_AGGS_NO_UNIQ),
-            new Pair<String, AggregatorFactory[]>("druid.sample.json.bottom", METRIC_AGGS)
+            new Pair<>("druid.sample.json.top", METRIC_AGGS_NO_UNIQ),
+            new Pair<>("druid.sample.json.bottom", METRIC_AGGS)
         )
     );
   }
@@ -463,7 +463,7 @@ private QueryableIndex makeMergedMMappedIndex(Iterable<Pair<String, AggregatorFa
               Lists.newArrayList(
                   Iterables.transform(
                       filesToMap,
-                      new Function<File, QueryableIndex>()
+                      new Function<>()
                       {
                         @Override
                         public QueryableIndex apply(@Nullable File input)
diff --git a/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java b/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java
index 23498cf6d3ba..063e8cc0c2d7 100644
--- a/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java
@@ -253,7 +253,7 @@ public void testFullOnSearch()
                               .build();
 
     List<Result<SearchResultValue>> expectedResults = Collections.singletonList(
-        new Result<SearchResultValue>(
+        new Result<>(
             DateTimes.of("2011-01-12T00:00:00.000Z"),
             new SearchResultValue(
                 Arrays.asList(
@@ -278,7 +278,7 @@ public void testTimeBoundary()
                                     .build();
 
     List<Result<TimeBoundaryResultValue>> expectedResults = Collections.singletonList(
-        new Result<TimeBoundaryResultValue>(
+        new Result<>(
             DateTimes.of("2011-01-12T00:00:00.000Z"),
             new TimeBoundaryResultValue(
                 ImmutableMap.of(
diff --git a/processing/src/test/java/org/apache/druid/segment/TestIndex.java b/processing/src/test/java/org/apache/druid/segment/TestIndex.java
index b4cd022e442c..83f1ec476495 100644
--- a/processing/src/test/java/org/apache/druid/segment/TestIndex.java
+++ b/processing/src/test/java/org/apache/druid/segment/TestIndex.java
@@ -567,7 +567,7 @@ public static IncrementalIndex loadIncrementalIndexFromCharSource(
     final IncrementalIndex retVal = indexSupplier.get();
     final AtomicLong startTime = new AtomicLong();
     int lineCount = source.readLines(
-        new LineProcessor<Integer>()
+        new LineProcessor<>()
         {
           boolean runOnce = false;
           int lineCount = 0;
diff --git a/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java b/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java
index d736b5622730..ef26393a7734 100644
--- a/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java
@@ -298,7 +298,7 @@ public void test_unnest_factory_basic_row_based_array_column()
                     new Object[]{3L, new Object[]{8L, 9L, 10L}}
                 )
             ),
-            new RowAdapter<Object[]>()
+            new RowAdapter<>()
             {
               @Override
               public ToLongFunction<Object[]> timestampFunction()
diff --git a/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplierTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplierTest.java
index 945f86eb8ef1..214da00365bc 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplierTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplierTest.java
@@ -183,7 +183,7 @@ public void testConcurrentThreadReads() throws Exception
   {
     setupSimple(5);
 
-    final AtomicReference<String> reason = new AtomicReference<String>("none");
+    final AtomicReference<String> reason = new AtomicReference<>("none");
 
     final int numRuns = 1000;
     final CountDownLatch startLatch = new CountDownLatch(1);
diff --git a/processing/src/test/java/org/apache/druid/segment/data/CompressedDoublesSerdeTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedDoublesSerdeTest.java
index 613809b836fb..e4f416c31ee4 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/CompressedDoublesSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedDoublesSerdeTest.java
@@ -234,7 +234,7 @@ private void testConcurrentThreadReads(
       final double[] vals
   ) throws Exception
   {
-    final AtomicReference<String> reason = new AtomicReference<String>("none");
+    final AtomicReference<String> reason = new AtomicReference<>("none");
 
     final int numRuns = 1000;
     final CountDownLatch startLatch = new CountDownLatch(1);
diff --git a/processing/src/test/java/org/apache/druid/segment/data/CompressedFloatsSerdeTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedFloatsSerdeTest.java
index 02e320f46a47..1994e316de49 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/CompressedFloatsSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedFloatsSerdeTest.java
@@ -256,7 +256,7 @@ private void testConcurrentThreadReads(
       final ColumnarFloats indexed, final float[] vals
   ) throws Exception
   {
-    final AtomicReference<String> reason = new AtomicReference<String>("none");
+    final AtomicReference<String> reason = new AtomicReference<>("none");
 
     final int numRuns = 1000;
     final CountDownLatch startLatch = new CountDownLatch(1);
diff --git a/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsSerdeTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsSerdeTest.java
index 00a7b339ddb1..dfc457fe8b9e 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsSerdeTest.java
@@ -271,7 +271,7 @@ private void testConcurrentThreadReads(
       final ColumnarLongs indexed, final long[] vals
   ) throws Exception
   {
-    final AtomicReference<String> reason = new AtomicReference<String>("none");
+    final AtomicReference<String> reason = new AtomicReference<>("none");
 
     final int numRuns = 1000;
     final CountDownLatch startLatch = new CountDownLatch(1);
diff --git a/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTestBase.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTestBase.java
index 9944c7216545..039cd0b57bbe 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTestBase.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTestBase.java
@@ -116,7 +116,7 @@ public static <T extends Closeable> WritableSupplier<T> wrapSupplier(
       Closer closer
   )
   {
-    return new WritableSupplier<T>()
+    return new WritableSupplier<>()
     {
       @Override
       public T get()
diff --git a/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java b/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java
index b29a571389ce..55bf31d8c176 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java
@@ -192,7 +192,7 @@ public static void populateIndex(long timestamp, IncrementalIndex index) throws
 
   public static MapBasedInputRow getRow(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);
@@ -204,7 +204,7 @@ public static MapBasedInputRow getRow(long timestamp, int rowID, int dimensionCo
 
   private static MapBasedInputRow getLongRow(long timestamp, 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);
@@ -561,7 +561,7 @@ public void run()
 
                     Double[] results = sequence.accumulate(
                         new Double[0],
-                        new Accumulator<Double[], Result<TimeseriesResultValue>>()
+                        new Accumulator<>()
                         {
                           @Override
                           public Double[] accumulate(Double[] accumulated, Result<TimeseriesResultValue> in)
diff --git a/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsTest.java b/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsTest.java
index 74bcb42413cc..1ead006ac3c7 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsTest.java
@@ -46,7 +46,7 @@ public void testSanity() throws Exception
     VSizeColumnarMultiInts indexed = VSizeColumnarMultiInts.fromIterable(
         Iterables.transform(
             someInts,
-            new Function<int[], VSizeColumnarInts>()
+            new Function<>()
             {
               @Override
               public VSizeColumnarInts apply(int[] input)
diff --git a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
index cbe2dd39e11f..15cd257d0253 100644
--- a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
@@ -490,7 +490,7 @@ public void testSpatialQuery()
                                   .build();
 
     List<Result<TimeseriesResultValue>> expectedResults = Collections.singletonList(
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-01T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -540,7 +540,7 @@ public void testSpatialQueryMorePoints()
                                   .build();
 
     List<Result<TimeseriesResultValue>> expectedResults = Arrays.asList(
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-01T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -549,7 +549,7 @@ public void testSpatialQueryMorePoints()
                     .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-02T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -558,7 +558,7 @@ public void testSpatialQueryMorePoints()
                     .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-03T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -567,7 +567,7 @@ public void testSpatialQueryMorePoints()
                     .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-04T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -576,7 +576,7 @@ public void testSpatialQueryMorePoints()
                     .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-05T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
diff --git a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
index 2d2b98035af3..4d7d2d26c98a 100644
--- a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
@@ -578,7 +578,7 @@ public void testSpatialQuery()
                                   .build();
 
     List<Result<TimeseriesResultValue>> expectedResults = Collections.singletonList(
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-01T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -630,7 +630,7 @@ public void testSpatialQueryWithOtherSpatialDim()
                                   .build();
 
     List<Result<TimeseriesResultValue>> expectedResults = Collections.singletonList(
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-01T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -681,7 +681,7 @@ public void testSpatialQueryMorePoints()
                                   .build();
 
     List<Result<TimeseriesResultValue>> expectedResults = Arrays.asList(
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-01T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -690,7 +690,7 @@ public void testSpatialQueryMorePoints()
                             .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-02T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -699,7 +699,7 @@ public void testSpatialQueryMorePoints()
                             .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-03T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -708,7 +708,7 @@ public void testSpatialQueryMorePoints()
                             .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-04T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -717,7 +717,7 @@ public void testSpatialQueryMorePoints()
                             .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-05T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
diff --git a/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java b/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java
index dd88367e7832..11f5223d6831 100644
--- a/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java
@@ -546,7 +546,7 @@ public void addRow(InputRow row)
     {
       for (String dim : row.getDimensions()) {
         if (dimensionMap.get(dim) == null) {
-          dimensionMap.put(dim, new HashMap<Object, RowValuePropertyTracker>());
+          dimensionMap.put(dim, new HashMap<>());
         }
 
         Map<Object, RowValuePropertyTracker> valueMap = dimensionMap.get(dim);
diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java
index f5779bf73629..261ac1ccf55c 100644
--- a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java
@@ -82,7 +82,7 @@ public void test() throws IndexSizeExceededException
                                                           .withDimensionsSpec(dimensionsSpec)
                                                           .withRollup(false)
                                                           .build();
-    Map<String, Object> map = new HashMap<String, Object>()
+    Map<String, Object> map = new HashMap<>()
     {
       @Override
       public Object get(Object key)
diff --git a/processing/src/test/java/org/apache/druid/segment/join/JoinTestHelper.java b/processing/src/test/java/org/apache/druid/segment/join/JoinTestHelper.java
index 33ad0dfb6a8a..7536c74c4a3f 100644
--- a/processing/src/test/java/org/apache/druid/segment/join/JoinTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/segment/join/JoinTestHelper.java
@@ -121,7 +121,7 @@ public class JoinTestHelper
                   .build();
 
   private static final ColumnProcessorFactory<Supplier<Object>> SIMPLE_READER =
-      new ColumnProcessorFactory<Supplier<Object>>()
+      new ColumnProcessorFactory<>()
       {
         @Override
         public ColumnType defaultType()
@@ -174,7 +174,7 @@ public Supplier<Object> makeComplexProcessor(BaseObjectColumnValueSelector<?> se
 
   private static RowAdapter<Map<String, Object>> createMapRowAdapter(final RowSignature signature)
   {
-    return new RowAdapter<Map<String, Object>>()
+    return new RowAdapter<>()
     {
       @Override
       public ToLongFunction<Map<String, Object>> timestampFunction()
diff --git a/processing/src/test/java/org/apache/druid/segment/nested/NestedPathPartTest.java b/processing/src/test/java/org/apache/druid/segment/nested/NestedPathPartTest.java
index 21118836f199..f11c748789e1 100644
--- a/processing/src/test/java/org/apache/druid/segment/nested/NestedPathPartTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/nested/NestedPathPartTest.java
@@ -32,9 +32,7 @@
 public class NestedPathPartTest
 {
   private static final ObjectMapper JSON_MAPPER = new DefaultObjectMapper();
-  private static final TypeReference<List<NestedPathPart>> TYPE_REF = new TypeReference<List<NestedPathPart>>()
-  {
-  };
+  private static final TypeReference<List<NestedPathPart>> TYPE_REF = new TypeReference<>() {};
 
   @Test
   public void testMapFieldSerde() throws JsonProcessingException
diff --git a/processing/src/test/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexedTest.java b/processing/src/test/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexedTest.java
index e5dd68978a3d..0b8886e04a8b 100644
--- a/processing/src/test/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexedTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexedTest.java
@@ -150,7 +150,7 @@ public void testSizeThreeSorted()
 
   private <T> CombineFirstTwoEntriesIndexed<T> wrap(final Indexed<T> indexed, @Nullable final T newFirstValue)
   {
-    return new CombineFirstTwoEntriesIndexed<T>(indexed)
+    return new CombineFirstTwoEntriesIndexed<>(indexed)
     {
       @Override
       protected T newFirstValue()
diff --git a/processing/src/test/java/org/apache/druid/segment/serde/cell/BytesReadWriteTestBase.java b/processing/src/test/java/org/apache/druid/segment/serde/cell/BytesReadWriteTestBase.java
index f8c79ab6064c..251c5296b255 100644
--- a/processing/src/test/java/org/apache/druid/segment/serde/cell/BytesReadWriteTestBase.java
+++ b/processing/src/test/java/org/apache/druid/segment/serde/cell/BytesReadWriteTestBase.java
@@ -206,7 +206,7 @@ public void testSingleWriteByteBufferAlternateByteBufferProvider() throws Except
 
     List<ByteBuffer> bufferList = testHelper.generateRaggedPayloadBuffer(100, 1024, 10, 0, 0, 10);
 
-    testHelper.setByteBufferProvider(() -> new ResourceHolder<ByteBuffer>()
+    testHelper.setByteBufferProvider(() -> new ResourceHolder<>()
     {
       @Override
       public ByteBuffer get()
diff --git a/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java b/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java
index 6bf483df36be..fe0d8c6f75a9 100644
--- a/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java
@@ -734,7 +734,7 @@ private static <T> ColumnValueSelector<T> objectSelectorFromSupplier(
       final Class<T> clazz
   )
   {
-    return new TestObjectColumnSelector<T>()
+    return new TestObjectColumnSelector<>()
     {
       @Override
       public Class<T> classOfObject()
diff --git a/processing/src/test/java/org/apache/druid/storage/remote/TestStorageConnector.java b/processing/src/test/java/org/apache/druid/storage/remote/TestStorageConnector.java
index e5757a949265..f6ac89df1ae3 100644
--- a/processing/src/test/java/org/apache/druid/storage/remote/TestStorageConnector.java
+++ b/processing/src/test/java/org/apache/druid/storage/remote/TestStorageConnector.java
@@ -68,7 +68,7 @@ public ChunkingStorageConnectorParameters<TestStorageConnector.InputRange> build
     builder.retryCondition(Predicates.alwaysFalse());
     builder.maxRetry(2);
     builder.objectSupplier((start, end) -> new InputRange((int) start, (int) end));
-    builder.objectOpenFunction(new ObjectOpenFunction<InputRange>()
+    builder.objectOpenFunction(new ObjectOpenFunction<>()
     {
       @Override
       public InputStream open(InputRange ir)
diff --git a/processing/src/test/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpecTest.java b/processing/src/test/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpecTest.java
index c3cceae5fa5d..9996b0aeb82f 100644
--- a/processing/src/test/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpecTest.java
+++ b/processing/src/test/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpecTest.java
@@ -121,7 +121,7 @@ public void testPartitionChunks()
 
     final List<PartitionChunk<String>> chunks = Lists.transform(
         specs,
-        new Function<ShardSpec, PartitionChunk<String>>()
+        new Function<>()
         {
           @Override
           public PartitionChunk<String> apply(ShardSpec shardSpec)
diff --git a/processing/src/test/java/org/apache/druid/timeline/partition/NumberedShardSpecTest.java b/processing/src/test/java/org/apache/druid/timeline/partition/NumberedShardSpecTest.java
index 4a3ba4c2df19..12b737211e32 100644
--- a/processing/src/test/java/org/apache/druid/timeline/partition/NumberedShardSpecTest.java
+++ b/processing/src/test/java/org/apache/druid/timeline/partition/NumberedShardSpecTest.java
@@ -84,7 +84,7 @@ public void testPartitionChunks()
 
     final List<PartitionChunk<String>> chunks = Lists.transform(
         specs,
-        new Function<ShardSpec, PartitionChunk<String>>()
+        new Function<>()
         {
           @Override
           public PartitionChunk<String> apply(ShardSpec shardSpec)
diff --git a/processing/src/test/java/org/apache/druid/timeline/partition/PartitionHolderCompletenessTest.java b/processing/src/test/java/org/apache/druid/timeline/partition/PartitionHolderCompletenessTest.java
index 098f39116589..2c3442645d26 100644
--- a/processing/src/test/java/org/apache/druid/timeline/partition/PartitionHolderCompletenessTest.java
+++ b/processing/src/test/java/org/apache/druid/timeline/partition/PartitionHolderCompletenessTest.java
@@ -177,7 +177,7 @@ public void testHasNoData()
                                              .size(1)
                                              .build();
     final PartitionChunk<DataSegment> partitionChunk = new TombstonePartitionedChunk<>(tombstone);
-    final PartitionHolder<DataSegment> partitionHolder = new PartitionHolder<DataSegment>(partitionChunk);
+    final PartitionHolder<DataSegment> partitionHolder = new PartitionHolder<>(partitionChunk);
     Assert.assertFalse(partitionHolder.hasData());
   }
 }
diff --git a/processing/src/test/java/org/apache/druid/timeline/partition/TombstonePartitionedChunkTest.java b/processing/src/test/java/org/apache/druid/timeline/partition/TombstonePartitionedChunkTest.java
index f1b5bf40f658..7a9a460bea55 100644
--- a/processing/src/test/java/org/apache/druid/timeline/partition/TombstonePartitionedChunkTest.java
+++ b/processing/src/test/java/org/apache/druid/timeline/partition/TombstonePartitionedChunkTest.java
@@ -73,7 +73,7 @@ public void compareTo()
     Exception exception = Assert.assertThrows(
         IllegalArgumentException.class,
         () -> tombstonePartitionedChunk.compareTo(
-              new NumberedPartitionChunk<Object>(0, 1, new Object()))
+            new NumberedPartitionChunk<>(0, 1, new Object()))
     );
     Assert.assertEquals("Cannot compare against something that is not a TombstonePartitionedChunk.",
                         exception.getMessage());
diff --git a/server/src/main/java/org/apache/druid/catalog/model/ModelProperties.java b/server/src/main/java/org/apache/druid/catalog/model/ModelProperties.java
index 25545cc6883e..6069321a0d3f 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/ModelProperties.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/ModelProperties.java
@@ -364,7 +364,7 @@ public StringListPropertyDefn(String name)
       super(
           name,
           "string list",
-          new TypeReference<List<String>>() {}
+          new TypeReference<>() {}
       );
     }
   }
diff --git a/server/src/main/java/org/apache/druid/catalog/model/SchemaRegistryImpl.java b/server/src/main/java/org/apache/druid/catalog/model/SchemaRegistryImpl.java
index 7e9eced28462..ff3b25b45e7b 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/SchemaRegistryImpl.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/SchemaRegistryImpl.java
@@ -139,7 +139,7 @@ public SchemaSpec schema(String name)
   @Override
   public Set<String> names()
   {
-    return new TreeSet<String>(builtIns.keySet());
+    return new TreeSet<>(builtIns.keySet());
   }
 
   @Override
diff --git a/server/src/main/java/org/apache/druid/catalog/model/table/ClusterKeySpec.java b/server/src/main/java/org/apache/druid/catalog/model/table/ClusterKeySpec.java
index fb4e899d3be3..10a06705113b 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/table/ClusterKeySpec.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/table/ClusterKeySpec.java
@@ -41,7 +41,7 @@
 public class ClusterKeySpec
 {
   public static final TypeReference<List<ClusterKeySpec>> CLUSTER_KEY_LIST_TYPE_REF =
-      new TypeReference<List<ClusterKeySpec>>() { };
+      new TypeReference<>() {};
 
   private final String expr;
   private final boolean desc;
diff --git a/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java b/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
index cca497f0b7ff..297188dd9cc1 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
@@ -110,7 +110,7 @@ public ClusterKeysDefn()
       super(
           CLUSTER_KEYS_PROPERTY,
           "ClusterKeySpec list",
-          new TypeReference<List<ClusterKeySpec>>() {}
+          new TypeReference<>() {}
       );
     }
 
diff --git a/server/src/main/java/org/apache/druid/catalog/model/table/ExternalTableDefn.java b/server/src/main/java/org/apache/druid/catalog/model/table/ExternalTableDefn.java
index 09a19d118276..015f7195c2a3 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/table/ExternalTableDefn.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/table/ExternalTableDefn.java
@@ -224,19 +224,19 @@ public class ExternalTableDefn extends TableDefn
    * Definition of the input source property.
    */
   private static final PropertyDefn<InputSource> SOURCE_PROPERTY_DEFN =
-      new ObjectPropertyDefn<InputSource>(SOURCE_PROPERTY, InputSource.class);
+      new ObjectPropertyDefn<>(SOURCE_PROPERTY, InputSource.class);
 
   /**
    * Definition of the input format property.
    */
   private static final PropertyDefn<InputFormat> FORMAT_PROPERTY_DEFN =
-      new ObjectPropertyDefn<InputFormat>(FORMAT_PROPERTY, InputFormat.class);
+      new ObjectPropertyDefn<>(FORMAT_PROPERTY, InputFormat.class);
 
   /**
    * Type reference used to deserialize JSON to a generic map.
    */
   @VisibleForTesting
-  public static final TypeReference<Map<String, Object>> MAP_TYPE_REF = new TypeReference<Map<String, Object>>() { };
+  public static final TypeReference<Map<String, Object>> MAP_TYPE_REF = new TypeReference<>() {};
 
   private TableDefnRegistry registry;
 
diff --git a/server/src/main/java/org/apache/druid/catalog/model/table/HttpInputSourceDefn.java b/server/src/main/java/org/apache/druid/catalog/model/table/HttpInputSourceDefn.java
index 110974d18ca7..e6272e2de4b7 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/table/HttpInputSourceDefn.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/table/HttpInputSourceDefn.java
@@ -310,7 +310,7 @@ private void convertHeaderArg(Map<String, Object> jsonMap, Map<String, Object> a
     Map<String, String> headersMap;
     if (requestHeaders != null) {
       try {
-        headersMap = DefaultObjectMapper.INSTANCE.readValue(requestHeaders, new TypeReference<Map<String, String>>(){});
+        headersMap = DefaultObjectMapper.INSTANCE.readValue(requestHeaders, new TypeReference<>() {});
       }
       catch (JsonProcessingException e) {
         throw new ISE("Failed read map from headers json");
diff --git a/server/src/main/java/org/apache/druid/client/BatchServerInventoryView.java b/server/src/main/java/org/apache/druid/client/BatchServerInventoryView.java
index 00dfbce8b899..58d4fb0927ee 100644
--- a/server/src/main/java/org/apache/druid/client/BatchServerInventoryView.java
+++ b/server/src/main/java/org/apache/druid/client/BatchServerInventoryView.java
@@ -98,7 +98,7 @@ public String getInventoryPath()
           }
         },
         Execs.singleThreaded(pathChildrenCacheExecPrefix + "-%s"),
-        new CuratorInventoryManagerStrategy<DruidServer, Set<DataSegment>>()
+        new CuratorInventoryManagerStrategy<>()
         {
           @Override
           public DruidServer deserializeContainer(byte[] bytes)
@@ -115,9 +115,7 @@ public DruidServer deserializeContainer(byte[] bytes)
           public Set<DataSegment> deserializeInventory(byte[] bytes)
           {
             try {
-              return jsonMapper.readValue(bytes, new TypeReference<Set<DataSegment>>()
-              {
-              });
+              return jsonMapper.readValue(bytes, new TypeReference<>() {});
             }
             catch (IOException e) {
               log.error(e, "Could not parse json: %s", StringUtils.fromUtf8(bytes));
@@ -343,7 +341,7 @@ private Set<DataSegment> filterInventory(final DruidServer container, Set<DataSe
             Iterables.filter(
                 Iterables.transform(
                     inventory,
-                    new Function<DataSegment, Pair<DruidServerMetadata, DataSegment>>()
+                    new Function<>()
                     {
                       @Override
                       public Pair<DruidServerMetadata, DataSegment> apply(DataSegment input)
diff --git a/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java b/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java
index fe64ba7ed42e..a4c8327f1a47 100644
--- a/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java
+++ b/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java
@@ -180,7 +180,7 @@ public ServerView.CallbackAction segmentRemoved(DruidServerMetadata server, Data
   @Override
   public <T> QueryRunner<T> getQueryRunnerForIntervals(final Query<T> query, final Iterable<Interval> intervals)
   {
-    return new QueryRunner<T>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext responseContext)
@@ -219,7 +219,7 @@ private static <T> void initializeNumRemainingResponsesInResponseContext(
   @Override
   public <T> QueryRunner<T> getQueryRunnerForSegments(final Query<T> query, final Iterable<SegmentDescriptor> specs)
   {
-    return new QueryRunner<T>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext responseContext)
@@ -630,7 +630,7 @@ private void addSequencesFromCache(
       for (Pair<Interval, byte[]> cachedResultPair : cachedResults) {
         final byte[] cachedResult = cachedResultPair.rhs;
         Sequence<Object> cachedSequence = new BaseSequence<>(
-            new BaseSequence.IteratorMaker<Object, Iterator<Object>>()
+            new BaseSequence.IteratorMaker<>()
             {
               @Override
               public Iterator<Object> make()
diff --git a/server/src/main/java/org/apache/druid/client/DirectDruidClient.java b/server/src/main/java/org/apache/druid/client/DirectDruidClient.java
index 0ae29c2e741c..ce79ad7140d6 100644
--- a/server/src/main/java/org/apache/druid/client/DirectDruidClient.java
+++ b/server/src/main/java/org/apache/druid/client/DirectDruidClient.java
@@ -174,7 +174,7 @@ public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext conte
       final long maxQueuedBytes = queryContext.getMaxQueuedBytes(0);
       final boolean usingBackpressure = maxQueuedBytes > 0;
 
-      final HttpResponseHandler<InputStream, InputStream> responseHandler = new HttpResponseHandler<InputStream, InputStream>()
+      final HttpResponseHandler<InputStream, InputStream> responseHandler = new HttpResponseHandler<>()
       {
         private final AtomicLong totalByteCount = new AtomicLong(0);
         private final AtomicLong queuedByteCount = new AtomicLong(0);
@@ -276,7 +276,7 @@ public int read() throws IOException
           totalByteCount.addAndGet(response.getContent().readableBytes());
           return ClientResponse.finished(
               new SequenceInputStream(
-                  new Enumeration<InputStream>()
+                  new Enumeration<>()
                   {
                     @Override
                     public boolean hasMoreElements()
@@ -480,7 +480,7 @@ private void checkTotalBytesLimit(long bytes)
       queryWatcher.registerQueryFuture(query, future);
       Futures.addCallback(
           future,
-          new FutureCallback<InputStream>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(InputStream result)
@@ -511,7 +511,7 @@ public void onFailure(Throwable t)
           @Override
           public JsonParserIterator<T> make()
           {
-            return new JsonParserIterator<T>(
+            return new JsonParserIterator<>(
                 queryResultType,
                 future,
                 url,
diff --git a/server/src/main/java/org/apache/druid/client/HttpServerInventoryView.java b/server/src/main/java/org/apache/druid/client/HttpServerInventoryView.java
index 894eee051aff..d19df0c2d73e 100644
--- a/server/src/main/java/org/apache/druid/client/HttpServerInventoryView.java
+++ b/server/src/main/java/org/apache/druid/client/HttpServerInventoryView.java
@@ -86,7 +86,7 @@
 public class HttpServerInventoryView implements ServerInventoryView, FilteredServerInventoryView
 {
   public static final TypeReference<ChangeRequestsSnapshot<DataSegmentChangeRequest>> SEGMENT_LIST_RESP_TYPE_REF =
-      new TypeReference<ChangeRequestsSnapshot<DataSegmentChangeRequest>>() {};
+      new TypeReference<>() {};
 
   private final EmittingLogger log = new EmittingLogger(HttpServerInventoryView.class);
   private final DruidNodeDiscoveryProvider druidNodeDiscoveryProvider;
@@ -583,7 +583,7 @@ boolean isSyncedSuccessfullyAtleastOnce()
 
     private ChangeRequestHttpSyncer.Listener<DataSegmentChangeRequest> createSyncListener()
     {
-      return new ChangeRequestHttpSyncer.Listener<DataSegmentChangeRequest>()
+      return new ChangeRequestHttpSyncer.Listener<>()
       {
         @Override
         public void fullSync(List<DataSegmentChangeRequest> changes)
@@ -641,7 +641,7 @@ private void addSegment(DataSegment segment, boolean fullSync)
           DataSegment theSegment = DataSegmentInterner.intern(segment);
           druidServer.addDataSegment(theSegment);
           runSegmentCallbacks(
-              new Function<SegmentCallback, CallbackAction>()
+              new Function<>()
               {
                 @Override
                 public CallbackAction apply(SegmentCallback input)
@@ -665,7 +665,7 @@ private void removeSegment(final DataSegment segment, boolean fullSync)
     {
       if (druidServer.removeDataSegment(segment.getId()) != null) {
         runSegmentCallbacks(
-            new Function<SegmentCallback, CallbackAction>()
+            new Function<>()
             {
               @Override
               public CallbackAction apply(SegmentCallback input)
diff --git a/server/src/main/java/org/apache/druid/client/broker/BrokerClientImpl.java b/server/src/main/java/org/apache/druid/client/broker/BrokerClientImpl.java
index 012aea746181..728a67401b2e 100644
--- a/server/src/main/java/org/apache/druid/client/broker/BrokerClientImpl.java
+++ b/server/src/main/java/org/apache/druid/client/broker/BrokerClientImpl.java
@@ -77,7 +77,7 @@ public ListenableFuture<List<ExplainPlan>> fetchExplainPlan(final ClientSqlQuery
                 .jsonContent(jsonMapper, explainSqlQuery),
             new BytesFullResponseHandler()
         ),
-        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<List<ExplainPlan>>() {})
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 }
diff --git a/server/src/main/java/org/apache/druid/client/cache/BackgroundCachePopulator.java b/server/src/main/java/org/apache/druid/client/cache/BackgroundCachePopulator.java
index 57209edea29c..ee032e84b308 100644
--- a/server/src/main/java/org/apache/druid/client/cache/BackgroundCachePopulator.java
+++ b/server/src/main/java/org/apache/druid/client/cache/BackgroundCachePopulator.java
@@ -90,7 +90,7 @@ public <T, CacheType> Sequence<T> wrap(
         () -> {
           Futures.addCallback(
               Futures.allAsList(cacheFutures),
-              new FutureCallback<List<CacheType>>()
+              new FutureCallback<>()
               {
                 @Override
                 public void onSuccess(List<CacheType> results)
diff --git a/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java b/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
index d5849fad99e8..6b8fd8fd4f60 100644
--- a/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
+++ b/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
@@ -111,7 +111,7 @@ public static MemcachedCache create(final MemcachedCacheConfig config)
     final AbstractMonitor monitor =
         new AbstractMonitor()
         {
-          final AtomicReference<Map<String, Long>> priorValues = new AtomicReference<Map<String, Long>>(new HashMap<String, Long>());
+          final AtomicReference<Map<String, Long>> priorValues = new AtomicReference<>(new HashMap<>());
 
           @Override
           public boolean doMonitor(ServiceEmitter emitter)
@@ -168,7 +168,7 @@ private Map<String, Long> getCurrentValues()
         opQueueFactory = new LinkedOperationQueueFactory();
       }
 
-      final Predicate<String> interesting = new Predicate<String>()
+      final Predicate<String> interesting = new Predicate<>()
       {
         // See net.spy.memcached.MemcachedConnection.registerMetrics()
         private final Set<String> interestingMetrics = ImmutableSet.of(
@@ -356,7 +356,7 @@ public void updateHistogram(String name, int amount)
       if (config.getNumConnections() > 1) {
         clientSupplier = new MemcacheClientPool(
             config.getNumConnections(),
-            new Supplier<MemcachedClientIF>()
+            new Supplier<>()
             {
               @Override
               public MemcachedClientIF get()
@@ -566,7 +566,7 @@ public Map<NamedKey, byte[]> getBulk(Iterable<NamedKey> keys)
     try (ResourceHolder<MemcachedClientIF> clientHolder = client.get()) {
       Map<String, NamedKey> keyLookup = Maps.uniqueIndex(
           keys,
-          new Function<NamedKey, String>()
+          new Function<>()
           {
             @Override
             public String apply(
diff --git a/server/src/main/java/org/apache/druid/client/cache/MemcachedOperationQueueFactory.java b/server/src/main/java/org/apache/druid/client/cache/MemcachedOperationQueueFactory.java
index b046dc06c900..d3ee91064124 100644
--- a/server/src/main/java/org/apache/druid/client/cache/MemcachedOperationQueueFactory.java
+++ b/server/src/main/java/org/apache/druid/client/cache/MemcachedOperationQueueFactory.java
@@ -36,7 +36,7 @@ public MemcachedOperationQueueFactory(long maxQueueSize)
   @Override
   public BlockingQueue<Operation> create()
   {
-    return new BytesBoundedLinkedQueue<Operation>(maxQueueSize)
+    return new BytesBoundedLinkedQueue<>(maxQueueSize)
     {
       @Override
       public long getBytesSize(Operation operation)
diff --git a/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorClientImpl.java b/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorClientImpl.java
index fc3deee12ed3..224a766c719d 100644
--- a/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorClientImpl.java
+++ b/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorClientImpl.java
@@ -118,9 +118,7 @@ public Iterable<ImmutableSegmentLoadInfo> fetchServerViewSegments(String dataSou
           holder -> JacksonUtils.readValue(
               jsonMapper,
               holder.getContent(),
-              new TypeReference<Iterable<ImmutableSegmentLoadInfo>>()
-              {
-              }
+              new TypeReference<>() {}
           )
       );
       FutureUtils.getUnchecked(segments, true).forEach(retVal::add);
@@ -143,7 +141,7 @@ public ListenableFuture<List<DataSegment>> fetchUsedSegments(String dataSource,
                 .jsonContent(jsonMapper, intervals),
             new BytesFullResponseHandler()
         ),
-        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<List<DataSegment>>() {})
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 
@@ -157,7 +155,7 @@ public ListenableFuture<List<DataSourceInformation>> fetchDataSourceInformation(
                 .jsonContent(jsonMapper, dataSources),
             new BytesFullResponseHandler()
         ),
-        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<List<DataSourceInformation>>() {})
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 
@@ -198,7 +196,7 @@ public ListenableFuture<Set<String>> fetchDataSourcesWithUsedSegments()
             new RequestBuilder(HttpMethod.GET, path),
             new BytesFullResponseHandler()
         ),
-        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<Set<String>>() {})
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 }
diff --git a/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskTransformSpec.java b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskTransformSpec.java
index 5aa72023dc07..c8e3281956ac 100644
--- a/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskTransformSpec.java
+++ b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskTransformSpec.java
@@ -59,7 +59,7 @@ public Map<String, Object> asMap(ObjectMapper objectMapper)
   {
     return objectMapper.convertValue(
         this,
-        new TypeReference<Map<String, Object>>() {}
+        new TypeReference<>() {}
     );
   }
 
diff --git a/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java b/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java
index b65d85644d40..4abd24045245 100644
--- a/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java
+++ b/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java
@@ -67,7 +67,7 @@ public class Announcer
   private final List<Announceable> toUpdate = new ArrayList<>();
   private final ConcurrentMap<String, PathChildrenCache> listeners = new ConcurrentHashMap<>();
   private final ConcurrentMap<String, ConcurrentMap<String, byte[]>> announcements = new ConcurrentHashMap<>();
-  private final List<String> parentsIBuilt = new CopyOnWriteArrayList<String>();
+  private final List<String> parentsIBuilt = new CopyOnWriteArrayList<>();
 
   // Used for testing
   private Set<String> addedChildren;
@@ -228,7 +228,7 @@ public void announce(String path, byte[] bytes, boolean removeParentIfCreated)
           cache.getListenable().addListener(
               new PathChildrenCacheListener()
               {
-                private final AtomicReference<Set<String>> pathsLost = new AtomicReference<Set<String>>(null);
+                private final AtomicReference<Set<String>> pathsLost = new AtomicReference<>(null);
 
                 @Override
                 public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception
diff --git a/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java b/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java
index 4889261fcae4..a54801699cbf 100644
--- a/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java
+++ b/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java
@@ -107,7 +107,7 @@ public void configure(Properties properties)
    */
   public static void registerDefault(Binder binder)
   {
-    registerKey(binder, Key.get(new TypeLiteral<DruidNode>(){}));
+    registerKey(binder, Key.get(new TypeLiteral<>() {}));
   }
 
   /**
@@ -121,7 +121,7 @@ public static void registerDefault(Binder binder)
    */
   public static void register(Binder binder, Annotation annotation)
   {
-    registerKey(binder, Key.get(new TypeLiteral<DruidNode>(){}, annotation));
+    registerKey(binder, Key.get(new TypeLiteral<>() {}, annotation));
   }
 
   /**
@@ -136,7 +136,7 @@ public static void register(Binder binder, Annotation annotation)
    */
   public static void register(Binder binder, Class<? extends Annotation> annotation)
   {
-    registerKey(binder, Key.get(new TypeLiteral<DruidNode>(){}, annotation));
+    registerKey(binder, Key.get(new TypeLiteral<>() {}, annotation));
   }
 
   /**
diff --git a/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoverySelector.java b/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoverySelector.java
index 9d29d8015eaa..84f4fe81ce0f 100644
--- a/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoverySelector.java
+++ b/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoverySelector.java
@@ -53,7 +53,7 @@ public ServerDiscoverySelector(ServiceProvider serviceProvider, String name)
     this.name = name;
   }
 
-  private static final Function<ServiceInstance, Server> TO_SERVER = new Function<ServiceInstance, Server>()
+  private static final Function<ServiceInstance, Server> TO_SERVER = new Function<>()
   {
     @Override
     public Server apply(final ServiceInstance instance)
diff --git a/server/src/main/java/org/apache/druid/discovery/DataServerClient.java b/server/src/main/java/org/apache/druid/discovery/DataServerClient.java
index ce3d62ca91b5..c75b646bc8f9 100644
--- a/server/src/main/java/org/apache/druid/discovery/DataServerClient.java
+++ b/server/src/main/java/org/apache/druid/discovery/DataServerClient.java
@@ -102,7 +102,7 @@ public <T> Sequence<T> run(Query<T> query, ResponseContext responseContext, Java
     closer.register(() -> resultStreamFuture.cancel(true));
     Futures.addCallback(
         resultStreamFuture,
-        new FutureCallback<InputStream>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(InputStream result)
diff --git a/server/src/main/java/org/apache/druid/discovery/DataServerResponseHandler.java b/server/src/main/java/org/apache/druid/discovery/DataServerResponseHandler.java
index 5b52025a60e2..f710fefb8069 100644
--- a/server/src/main/java/org/apache/druid/discovery/DataServerResponseHandler.java
+++ b/server/src/main/java/org/apache/druid/discovery/DataServerResponseHandler.java
@@ -118,7 +118,7 @@ public int read() throws IOException
     }
     return ClientResponse.finished(
         new SequenceInputStream(
-            new Enumeration<InputStream>()
+            new Enumeration<>()
             {
               @Override
               public boolean hasMoreElements()
diff --git a/server/src/main/java/org/apache/druid/guice/DruidBinders.java b/server/src/main/java/org/apache/druid/guice/DruidBinders.java
index 63f2061ce136..fbec4f6219ff 100644
--- a/server/src/main/java/org/apache/druid/guice/DruidBinders.java
+++ b/server/src/main/java/org/apache/druid/guice/DruidBinders.java
@@ -39,7 +39,7 @@ public static MapBinder<Class<? extends Query>, QueryRunnerFactory> queryRunnerF
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends Query>>() {},
+        new TypeLiteral<>() {},
         TypeLiteral.get(QueryRunnerFactory.class)
     );
   }
@@ -48,8 +48,8 @@ public static MapBinder<Class<? extends Query>, QueryToolChest> queryToolChestBi
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends Query>>() {},
-        new TypeLiteral<QueryToolChest>() {}
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
   }
 
@@ -57,8 +57,8 @@ public static MapBinder<Class<? extends Query>, QueryLogic> queryLogicBinderType
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends Query>>() {},
-        new TypeLiteral<QueryLogic>() {}
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
   }
 
@@ -91,20 +91,20 @@ QueryLogicBinder bindQueryLogic(
 
   public static Multibinder<KeyHolder<DruidNode>> discoveryAnnouncementBinder(Binder binder)
   {
-    return Multibinder.newSetBinder(binder, new TypeLiteral<KeyHolder<DruidNode>>() {});
+    return Multibinder.newSetBinder(binder, new TypeLiteral<>() {});
   }
 
   public static Multibinder<Class<? extends Monitor>> metricMonitorBinder(Binder binder)
   {
-    return Multibinder.newSetBinder(binder, new TypeLiteral<Class<? extends Monitor>>() {});
+    return Multibinder.newSetBinder(binder, new TypeLiteral<>() {});
   }
 
   public static MapBinder<Class<? extends DataSource>, SegmentWrangler> segmentWranglerBinder(Binder binder)
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends DataSource>>() {},
-        new TypeLiteral<SegmentWrangler>() {}
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
   }
 
@@ -112,7 +112,7 @@ public static Multibinder<JoinableFactory> joinableFactoryMultiBinder(Binder bin
   {
     return Multibinder.newSetBinder(
         binder,
-        new TypeLiteral<JoinableFactory>() {}
+        new TypeLiteral<>() {}
     );
   }
 
@@ -120,8 +120,8 @@ public static MapBinder<Class<? extends JoinableFactory>, Class<? extends DataSo
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends JoinableFactory>>() {},
-        new TypeLiteral<Class<? extends DataSource>>() {}
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
   }
 }
diff --git a/server/src/main/java/org/apache/druid/guice/http/AbstractHttpClientProvider.java b/server/src/main/java/org/apache/druid/guice/http/AbstractHttpClientProvider.java
index 2967f9faedc7..3dbfd6351333 100644
--- a/server/src/main/java/org/apache/druid/guice/http/AbstractHttpClientProvider.java
+++ b/server/src/main/java/org/apache/druid/guice/http/AbstractHttpClientProvider.java
@@ -46,11 +46,7 @@ public AbstractHttpClientProvider(Class<? extends Annotation> annotation)
   {
     Preconditions.checkNotNull(annotation, "annotation");
 
-    configKey = Key.get(
-        new TypeLiteral<Supplier<DruidHttpClientConfig>>()
-        {
-        }, annotation
-    );
+    configKey = Key.get(new TypeLiteral<>() {}, annotation);
     sslContextKey = Key.get(SSLContext.class, annotation);
   }
 
diff --git a/server/src/main/java/org/apache/druid/messages/client/MessageRelay.java b/server/src/main/java/org/apache/druid/messages/client/MessageRelay.java
index deda87c7d23d..be67e5d412ee 100644
--- a/server/src/main/java/org/apache/druid/messages/client/MessageRelay.java
+++ b/server/src/main/java/org/apache/druid/messages/client/MessageRelay.java
@@ -148,7 +148,7 @@ private void issueNextGetMessagesCall()
 
       Futures.addCallback(
           future,
-          new FutureCallback<MessageBatch<MessageType>>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(final MessageBatch<MessageType> result)
diff --git a/server/src/main/java/org/apache/druid/messages/server/MessageRelayResource.java b/server/src/main/java/org/apache/druid/messages/server/MessageRelayResource.java
index f8e771d378c7..550fa64c89c0 100644
--- a/server/src/main/java/org/apache/druid/messages/server/MessageRelayResource.java
+++ b/server/src/main/java/org/apache/druid/messages/server/MessageRelayResource.java
@@ -149,7 +149,7 @@ public void onStartAsync(AsyncEvent event)
 
     Futures.addCallback(
         batchFuture,
-        new FutureCallback<MessageBatch<MessageType>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(MessageBatch<MessageType> result)
diff --git a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
index c85fd1c49608..8ecc2647e55d 100644
--- a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
+++ b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
@@ -658,7 +658,7 @@ public SegmentPublishResult commitMetadataOnly(
 
     try {
       return connector.retryTransaction(
-          new TransactionCallback<SegmentPublishResult>()
+          new TransactionCallback<>()
           {
             @Override
             public SegmentPublishResult inTransaction(
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
index 3f4e1da069ae..2daab510591a 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
@@ -622,7 +622,7 @@ public Void insertOrUpdate(
   )
   {
     return getDBI().inTransaction(
-        new TransactionCallback<Void>()
+        new TransactionCallback<>()
         {
           @Override
           public Void inTransaction(Handle handle, TransactionStatus transactionStatus)
@@ -668,7 +668,7 @@ public boolean compareAndSwap(
   {
     return getDBI().inTransaction(
         TransactionIsolationLevel.REPEATABLE_READ,
-        new TransactionCallback<Boolean>()
+        new TransactionCallback<>()
         {
           @Override
           public Boolean inTransaction(Handle handle, TransactionStatus transactionStatus)
@@ -891,7 +891,7 @@ public final <T> T inReadOnlyTransaction(
   )
   {
     return getDBI().withHandle(
-        new HandleCallback<T>()
+        new HandleCallback<>()
         {
           @Override
           public T withHandle(Handle handle) throws Exception
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
index 6cbefc84eeb4..eaf2efc82aaf 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
@@ -261,7 +261,7 @@ private boolean isTransientDruidException(Throwable t)
   public boolean setStatus(final String entryId, final boolean active, final StatusType status)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Boolean>()
+        new HandleCallback<>()
         {
           @Override
           public Boolean withHandle(Handle handle) throws Exception
@@ -285,7 +285,7 @@ public Boolean withHandle(Handle handle) throws Exception
   public Optional<EntryType> getEntry(final String entryId)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Optional<EntryType>>()
+        new HandleCallback<>()
         {
           @Override
           public Optional<EntryType> withHandle(Handle handle) throws Exception
@@ -310,7 +310,7 @@ public Optional<EntryType> withHandle(Handle handle) throws Exception
   public Optional<StatusType> getStatus(final String entryId)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Optional<StatusType>>()
+        new HandleCallback<>()
         {
           @Override
           public Optional<StatusType> withHandle(Handle handle) throws Exception
@@ -801,7 +801,7 @@ public TaskInfo<EntryType, StatusType> map(int index, ResultSet resultSet, State
   public boolean addLock(final String entryId, final LockType lock)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Boolean>()
+        new HandleCallback<>()
         {
           @Override
           public Boolean withHandle(Handle handle) throws Exception
@@ -889,7 +889,7 @@ private int removeLock(Handle handle, long lockId)
   public Map<Long, LockType> getLocks(final String entryId)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Map<Long, LockType>>()
+        new HandleCallback<>()
         {
           @Override
           public Map<Long, LockType> withHandle(Handle handle)
diff --git a/server/src/main/java/org/apache/druid/metadata/SqlSegmentsMetadataManager.java b/server/src/main/java/org/apache/druid/metadata/SqlSegmentsMetadataManager.java
index 053dc10f41c2..7213cd3481b2 100644
--- a/server/src/main/java/org/apache/druid/metadata/SqlSegmentsMetadataManager.java
+++ b/server/src/main/java/org/apache/druid/metadata/SqlSegmentsMetadataManager.java
@@ -1093,7 +1093,7 @@ private void doPollSegmentAndSchema()
     // setting connection to read-only will allow some database such as MySQL
     // to automatically use read-only transaction mode, further optimizing the query
     final List<DataSegment> segments = connector.inReadOnlyTransaction(
-        new TransactionCallback<List<DataSegment>>()
+        new TransactionCallback<>()
         {
           @Override
           public List<DataSegment> inTransaction(Handle handle, TransactionStatus status)
@@ -1251,7 +1251,7 @@ public List<Interval> getUnusedSegmentIntervals(
   {
     // Note that we handle the case where used_status_last_updated IS NULL here to allow smooth transition to Druid version that uses used_status_last_updated column
     return connector.inReadOnlyTransaction(
-        new TransactionCallback<List<Interval>>()
+        new TransactionCallback<>()
         {
           @Override
           public List<Interval> inTransaction(Handle handle, TransactionStatus status)
@@ -1272,7 +1272,7 @@ public List<Interval> inTransaction(Handle handle, TransactionStatus status)
                 .bind("end", maxEndTime.toString())
                 .bind("used_status_last_updated", maxUsedStatusLastUpdatedTime.toString())
                 .map(
-                    new BaseResultSetMapper<Interval>()
+                    new BaseResultSetMapper<>()
                     {
                       @Override
                       protected Interval mapInternal(int index, Map<String, Object> row)
diff --git a/server/src/main/java/org/apache/druid/metadata/input/SqlReader.java b/server/src/main/java/org/apache/druid/metadata/input/SqlReader.java
index 27c1f612c8b9..1e90e19a0a08 100644
--- a/server/src/main/java/org/apache/druid/metadata/input/SqlReader.java
+++ b/server/src/main/java/org/apache/druid/metadata/input/SqlReader.java
@@ -69,9 +69,7 @@ protected CloseableIterator<Map<String, Object>> intermediateRowIterator() throw
     //The results are fetched into local storage as this avoids having to keep a persistent database connection for a long time
     final InputEntity.CleanableFile resultFile = closer.register(source.fetch(temporaryDirectory, null));
     FileInputStream inputStream = new FileInputStream(resultFile.file());
-    JsonIterator<Map<String, Object>> jsonIterator = new JsonIterator<>(new TypeReference<Map<String, Object>>()
-    {
-    }, inputStream, closer, objectMapper);
+    JsonIterator<Map<String, Object>> jsonIterator = new JsonIterator<>(new TypeReference<>() {}, inputStream, closer, objectMapper);
     return jsonIterator;
   }
 
diff --git a/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
index 05e6300ba6d3..0ee9779a190d 100644
--- a/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
+++ b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
@@ -184,7 +184,7 @@ public ResultSet getIndexInfo(DatabaseMetaData databaseMetaData, String tableNam
   public boolean tableHasColumn(String tableName, String columnName)
   {
     return getDBI().withHandle(
-        new HandleCallback<Boolean>()
+        new HandleCallback<>()
         {
           @Override
           public Boolean withHandle(Handle handle)
diff --git a/server/src/main/java/org/apache/druid/query/ResultLevelCachingQueryRunner.java b/server/src/main/java/org/apache/druid/query/ResultLevelCachingQueryRunner.java
index 0af6ebca3ede..dedfb0028b77 100644
--- a/server/src/main/java/org/apache/druid/query/ResultLevelCachingQueryRunner.java
+++ b/server/src/main/java/org/apache/druid/query/ResultLevelCachingQueryRunner.java
@@ -120,7 +120,7 @@ public Sequence<T> run(QueryPlus queryPlus, ResponseContext responseContext)
         return Sequences.wrap(
             Sequences.map(
                 resultFromClient,
-                new Function<T, T>()
+                new Function<>()
                 {
                   @Override
                   public T apply(T input)
diff --git a/server/src/main/java/org/apache/druid/query/RetryQueryRunner.java b/server/src/main/java/org/apache/druid/query/RetryQueryRunner.java
index 00b9dd030c32..6d0899e9eaa2 100644
--- a/server/src/main/java/org/apache/druid/query/RetryQueryRunner.java
+++ b/server/src/main/java/org/apache/druid/query/RetryQueryRunner.java
@@ -108,7 +108,7 @@ public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext conte
     // runnableAfterFirstAttempt is only for testing, it must be no-op for production code.
     runnableAfterFirstAttempt.run();
 
-    return new YieldingSequenceBase<T>()
+    return new YieldingSequenceBase<>()
     {
       @Override
       public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulator<OutType, T> accumulator)
@@ -167,9 +167,7 @@ private List<SegmentDescriptor> getMissingSegments(QueryPlus<T> queryPlus, final
 
     return jsonMapper.convertValue(
         maybeMissingSegments,
-        new TypeReference<List<SegmentDescriptor>>()
-        {
-        }
+        new TypeReference<>() {}
     );
   }
 
diff --git a/server/src/main/java/org/apache/druid/query/lookup/LookupListeningResource.java b/server/src/main/java/org/apache/druid/query/lookup/LookupListeningResource.java
index 51117835b3bc..581fc7b97e58 100644
--- a/server/src/main/java/org/apache/druid/query/lookup/LookupListeningResource.java
+++ b/server/src/main/java/org/apache/druid/query/lookup/LookupListeningResource.java
@@ -47,9 +47,7 @@ class LookupListeningResource extends ListenerResource
   private static final Logger LOG = new Logger(LookupListeningResource.class);
 
   private static final TypeReference<LookupsState<Object>> LOOKUPS_STATE_GENERIC_REFERENCE =
-      new TypeReference<LookupsState<Object>>()
-      {
-      };
+      new TypeReference<>() {};
 
   @Inject
   public LookupListeningResource(
@@ -61,9 +59,7 @@ public LookupListeningResource(
     super(
         jsonMapper,
         smileMapper,
-        new AbstractListenerHandler<LookupExtractorFactory>(new TypeReference<LookupExtractorFactory>()
-        {
-        })
+        new AbstractListenerHandler<LookupExtractorFactory>(new TypeReference<>() {})
         {
           @Override
           public Response handleUpdates(InputStream inputStream, ObjectMapper mapper)
diff --git a/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java b/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java
index e840a5f89eeb..80dd522b0104 100644
--- a/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java
+++ b/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java
@@ -90,9 +90,7 @@ public class LookupReferencesManager implements LookupExtractorFactoryContainerP
   private static final EmittingLogger LOG = new EmittingLogger(LookupReferencesManager.class);
 
   private static final TypeReference<Map<String, Object>> LOOKUPS_ALL_GENERIC_REFERENCE =
-      new TypeReference<Map<String, Object>>()
-      {
-      };
+      new TypeReference<>() {};
 
   // Lookups state (loaded/to-be-loaded/to-be-dropped etc) is managed by immutable LookupUpdateState instance.
   // Any update to state is done by creating updated LookupUpdateState instance and atomically setting that
diff --git a/server/src/main/java/org/apache/druid/rpc/ServiceClientImpl.java b/server/src/main/java/org/apache/druid/rpc/ServiceClientImpl.java
index 172f220fabad..a1f63c5c8b25 100644
--- a/server/src/main/java/org/apache/druid/rpc/ServiceClientImpl.java
+++ b/server/src/main/java/org/apache/druid/rpc/ServiceClientImpl.java
@@ -178,7 +178,7 @@ private <IntermediateType, FinalType> void tryRequest(
 
           Futures.addCallback(
               responseFuture,
-              new FutureCallback<Either<StringFullResponseHolder, FinalType>>()
+              new FutureCallback<>()
               {
                 @Override
                 public void onSuccess(@Nullable final Either<StringFullResponseHolder, FinalType> result)
@@ -396,7 +396,7 @@ private <T> void whenServiceReady(final Consumer<ServiceLocations> callback, fin
   {
     Futures.addCallback(
         serviceLocator.locate(),
-        new FutureCallback<ServiceLocations>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(final ServiceLocations locations)
diff --git a/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java b/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java
index 1653962e1940..76077a2fbddb 100644
--- a/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java
+++ b/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java
@@ -173,7 +173,7 @@ public ListenableFuture<Map<String, TaskStatus>> taskStatuses(final Set<String>
             new BytesFullResponseHandler()
         ),
         holder ->
-            JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<Map<String, TaskStatus>>() {})
+            JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 
@@ -208,7 +208,7 @@ public ListenableFuture<Map<String, List<Interval>>> findLockedIntervals(
           final Map<String, List<Interval>> response = JacksonUtils.readValue(
               jsonMapper,
               holder.getContent(),
-              new TypeReference<Map<String, List<Interval>>>() {}
+              new TypeReference<>() {}
           );
 
           return response == null ? Collections.emptyMap() : response;
@@ -255,7 +255,7 @@ public ListenableFuture<List<IndexingWorkerInfo>> getWorkers()
             new BytesFullResponseHandler()
         ),
         holder ->
-            JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<List<IndexingWorkerInfo>>() {})
+            JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 
diff --git a/server/src/main/java/org/apache/druid/rpc/indexing/SpecificTaskServiceLocator.java b/server/src/main/java/org/apache/druid/rpc/indexing/SpecificTaskServiceLocator.java
index 689cbdce3072..a0c2d5a0272c 100644
--- a/server/src/main/java/org/apache/druid/rpc/indexing/SpecificTaskServiceLocator.java
+++ b/server/src/main/java/org/apache/druid/rpc/indexing/SpecificTaskServiceLocator.java
@@ -113,7 +113,7 @@ public ListenableFuture<ServiceLocations> locate()
 
         Futures.addCallback(
             taskStatusFuture,
-            new FutureCallback<Map<String, TaskStatus>>()
+            new FutureCallback<>()
             {
               @Override
               public void onSuccess(final Map<String, TaskStatus> taskStatusMap)
@@ -241,7 +241,7 @@ private void fetchFallbackTaskLocation()
 
         Futures.addCallback(
             taskStatusFuture,
-            new FutureCallback<TaskStatusResponse>()
+            new FutureCallback<>()
             {
               @Override
               public void onSuccess(final TaskStatusResponse taskStatusResponse)
diff --git a/server/src/main/java/org/apache/druid/segment/indexing/granularity/BaseGranularitySpec.java b/server/src/main/java/org/apache/druid/segment/indexing/granularity/BaseGranularitySpec.java
index ac9fdcae7e16..17185bac7f49 100644
--- a/server/src/main/java/org/apache/druid/segment/indexing/granularity/BaseGranularitySpec.java
+++ b/server/src/main/java/org/apache/druid/segment/indexing/granularity/BaseGranularitySpec.java
@@ -85,7 +85,7 @@ public Map<String, Object> asMap(ObjectMapper objectMapper)
   {
     return objectMapper.convertValue(
         this,
-        new TypeReference<Map<String, Object>>() {}
+        new TypeReference<>() {}
     );
   }
 
diff --git a/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java
index 27807a5c3c87..af75ba8f3119 100644
--- a/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java
+++ b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java
@@ -220,7 +220,7 @@ public Predicate<Throwable> shouldRetryPredicate()
     // not found, there's only so much that retries would do (unless the file was temporarily absent for some reason).
     // Since this is not a commonly used puller in production, and in general is more useful in testing/debugging,
     // I do not have a good sense of what kind of Exceptions people would expect to encounter in the wild
-    return new Predicate<Throwable>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(Throwable input)
diff --git a/server/src/main/java/org/apache/druid/segment/loading/RoundRobinStorageLocationSelectorStrategy.java b/server/src/main/java/org/apache/druid/segment/loading/RoundRobinStorageLocationSelectorStrategy.java
index 95e57f5130e4..3d14f8eda0b6 100644
--- a/server/src/main/java/org/apache/druid/segment/loading/RoundRobinStorageLocationSelectorStrategy.java
+++ b/server/src/main/java/org/apache/druid/segment/loading/RoundRobinStorageLocationSelectorStrategy.java
@@ -47,7 +47,7 @@ public RoundRobinStorageLocationSelectorStrategy(@JacksonInject List<StorageLoca
   @Override
   public Iterator<StorageLocation> getLocations()
   {
-    return new Iterator<StorageLocation>()
+    return new Iterator<>()
     {
 
       private final int numStorageLocations = storageLocations.size();
diff --git a/server/src/main/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalker.java b/server/src/main/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalker.java
index 68f264cebb48..6e721b552ca0 100644
--- a/server/src/main/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalker.java
+++ b/server/src/main/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalker.java
@@ -96,7 +96,7 @@ public <T> QueryRunner<T> getQueryRunnerForIntervals(Query<T> query, Iterable<In
   @Override
   public <T> QueryRunner<T> getQueryRunnerForSegments(Query<T> query, Iterable<SegmentDescriptor> specs)
   {
-    return decorateRunner(query, new QueryRunner<T>()
+    return decorateRunner(query, new QueryRunner<>()
     {
       @Override
       public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext responseContext)
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderator.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderator.java
index 16ac5ebfb969..2c6fe0f8769b 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderator.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderator.java
@@ -397,7 +397,7 @@ public AppenderatorAddResult add(
 
       Futures.addCallback(
           persistAll(null),
-          new FutureCallback<Object>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(@Nullable Object result)
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderator.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderator.java
index 71ba15fff68e..9597ae0b54cb 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderator.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderator.java
@@ -439,7 +439,7 @@ public AppenderatorAddResult add(
 
         Futures.addCallback(
             persistAll(committerSupplier == null ? null : committerSupplier.get()),
-            new FutureCallback<Object>()
+            new FutureCallback<>()
             {
               @Override
               public void onSuccess(@Nullable Object result)
@@ -684,7 +684,7 @@ public ListenableFuture<Object> persistAll(@Nullable final Committer committer)
     final Stopwatch persistStopwatch = Stopwatch.createStarted();
     AtomicLong totalPersistedRows = new AtomicLong(numPersistedRows);
     final ListenableFuture<Object> future = persistExecutor.submit(
-        new Callable<Object>()
+        new Callable<>()
         {
           @Override
           public Object call() throws IOException
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/sink/Sink.java b/server/src/main/java/org/apache/druid/segment/realtime/sink/Sink.java
index 702bc3e77adb..6d7e963208c5 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/sink/Sink.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/sink/Sink.java
@@ -443,7 +443,7 @@ public Iterator<FireHydrant> iterator()
   {
     return Iterators.filter(
         hydrants.iterator(),
-        new Predicate<FireHydrant>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(FireHydrant input)
diff --git a/server/src/main/java/org/apache/druid/server/ClientInfoResource.java b/server/src/main/java/org/apache/druid/server/ClientInfoResource.java
index e6632edfe5ea..7a404faf7c92 100644
--- a/server/src/main/java/org/apache/druid/server/ClientInfoResource.java
+++ b/server/src/main/java/org/apache/druid/server/ClientInfoResource.java
@@ -162,7 +162,7 @@ KEY_METRICS, getDataSourceMetrics(dataSourceName, interval)
       return Collections.emptyMap();
     }
     Map<Interval, Object> servedIntervals = new TreeMap<>(
-        new Comparator<Interval>()
+        new Comparator<>()
         {
           @Override
           public int compare(Interval o1, Interval o2)
diff --git a/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java b/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java
index b75161bdde6d..6b5b89124ceb 100644
--- a/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java
+++ b/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java
@@ -46,7 +46,6 @@
 import org.apache.druid.query.FrameSignaturePair;
 import org.apache.druid.query.GlobalTableDataSource;
 import org.apache.druid.query.InlineDataSource;
-import org.apache.druid.query.PostProcessingOperator;
 import org.apache.druid.query.Query;
 import org.apache.druid.query.QueryContext;
 import org.apache.druid.query.QueryContexts;
@@ -513,7 +512,7 @@ private <T> DataSource inlineIfNecessary(
       } else {
         // Cannot inline subquery. Attempt to inline one level deeper, and then try again.
 
-        List<DataSource> newDataSources = new ArrayList<DataSource>();
+        List<DataSource> newDataSources = new ArrayList<>();
         for (DataSource ds : dataSource.getChildren()) {
           newDataSources.add(
               inlineIfNecessary(
@@ -595,9 +594,7 @@ private <T> QueryRunner<T> decorateClusterRunner(Query<T> query, QueryRunner<T>
         .postProcess(
             objectMapper.convertValue(
                 query.context().getString("postProcessing"),
-                new TypeReference<PostProcessingOperator<T>>()
-                {
-                }
+                new TypeReference<>() {}
             )
         )
         .map(
diff --git a/server/src/main/java/org/apache/druid/server/QueryLifecycle.java b/server/src/main/java/org/apache/druid/server/QueryLifecycle.java
index c4ead8bedce7..292ad958e509 100644
--- a/server/src/main/java/org/apache/druid/server/QueryLifecycle.java
+++ b/server/src/main/java/org/apache/druid/server/QueryLifecycle.java
@@ -173,7 +173,7 @@ public <T> QueryResponse<T> runSimple(
      * cannot be moved into execute().  We leave this as an exercise for the future, however as this oddity
      * was discovered while just trying to expose HTTP response headers
      */
-    return new QueryResponse<T>(
+    return new QueryResponse<>(
         Sequences.wrap(
             results,
             new SequenceWrapper()
@@ -314,7 +314,7 @@ public <T> QueryResponse<T> execute()
                                   .withIdentity(authenticationResult.getIdentity())
                                   .run(texasRanger, responseContext);
 
-    return new QueryResponse<T>(res == null ? Sequences.empty() : res, responseContext);
+    return new QueryResponse<>(res == null ? Sequences.empty() : res, responseContext);
   }
 
   /**
diff --git a/server/src/main/java/org/apache/druid/server/QueryResponse.java b/server/src/main/java/org/apache/druid/server/QueryResponse.java
index d590c5014ef5..aa6b07c8e381 100644
--- a/server/src/main/java/org/apache/druid/server/QueryResponse.java
+++ b/server/src/main/java/org/apache/druid/server/QueryResponse.java
@@ -35,7 +35,7 @@ public QueryResponse(final Sequence<T> results, final ResponseContext responseCo
 
   public static <T> QueryResponse<T> withEmptyContext(Sequence<T> results)
   {
-    return new QueryResponse<T>(results, ResponseContext.createEmpty());
+    return new QueryResponse<>(results, ResponseContext.createEmpty());
   }
 
   public Sequence<T> getResults()
diff --git a/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java b/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java
index cf407102c5a7..d95dee729af0 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java
@@ -73,7 +73,7 @@ public class BatchDataSegmentAnnouncer implements DataSegmentAnnouncer
   private final Object lock = new Object();
   private final AtomicLong counter = new AtomicLong(0);
 
-  private final Set<SegmentZNode> availableZNodes = new ConcurrentSkipListSet<SegmentZNode>();
+  private final Set<SegmentZNode> availableZNodes = new ConcurrentSkipListSet<>();
   private final ConcurrentMap<DataSegment, SegmentZNode> segmentLookup = new ConcurrentHashMap<>();
   private final Function<DataSegment, DataSegment> segmentTransformer;
 
@@ -348,7 +348,7 @@ public ListenableFuture<ChangeRequestsSnapshot<DataSegmentChangeRequest>> getSeg
       synchronized (lock) {
         Iterable<DataSegmentChangeRequest> segments = Iterables.transform(
             segmentLookup.keySet(),
-            new Function<DataSegment, DataSegmentChangeRequest>()
+            new Function<>()
             {
               @Nullable
               @Override
@@ -361,7 +361,7 @@ public SegmentChangeRequestLoad apply(DataSegment input)
 
         Iterable<DataSegmentChangeRequest> sinkSchema = Iterables.transform(
             taskSinkSchema.values(),
-            new Function<SegmentSchemas, DataSegmentChangeRequest>()
+            new Function<>()
             {
               @Override
               public SegmentSchemasChangeRequest apply(SegmentSchemas input)
@@ -433,9 +433,7 @@ public Set<DataSegment> getSegments()
       try {
         return jsonMapper.readValue(
             bytes,
-            new TypeReference<Set<DataSegment>>()
-            {
-            }
+            new TypeReference<>() {}
         );
       }
       catch (Exception e) {
diff --git a/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncer.java b/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncer.java
index ef14b901b6c8..6db1eac5d5d6 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncer.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncer.java
@@ -256,7 +256,7 @@ private void sendSyncRequest()
 
       Futures.addCallback(
           syncRequestFuture,
-          new FutureCallback<InputStream>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(InputStream stream)
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java b/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java
index cea693a56757..2a6e03c8d1db 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java
@@ -219,7 +219,7 @@ private void doSegmentManagement()
 
       Futures.addCallback(
           future,
-          new FutureCallback<InputStream>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(InputStream result)
diff --git a/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterModule.java b/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterModule.java
index dd06e855290b..254f86193a12 100644
--- a/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterModule.java
+++ b/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterModule.java
@@ -57,7 +57,7 @@ public Emitter getEmitter(ComposingEmitterConfig config, final Injector injector
 
     List<Emitter> emitters = Lists.transform(
         config.getEmitters(),
-        new Function<String, Emitter>()
+        new Function<>()
         {
           @Override
           public Emitter apply(String s)
diff --git a/server/src/main/java/org/apache/druid/server/emitter/EmitterModule.java b/server/src/main/java/org/apache/druid/server/emitter/EmitterModule.java
index 7f4821768193..164416114cd5 100644
--- a/server/src/main/java/org/apache/druid/server/emitter/EmitterModule.java
+++ b/server/src/main/java/org/apache/druid/server/emitter/EmitterModule.java
@@ -130,7 +130,9 @@ private static class EmitterProvider implements Provider<Emitter>
     @Inject
     public void inject(Injector injector)
     {
-      final List<Binding<Emitter>> emitterBindings = injector.findBindingsByType(new TypeLiteral<Emitter>() {});
+      final List<Binding<Emitter>> emitterBindings = injector.findBindingsByType(new TypeLiteral<>()
+      {
+      });
 
       if (Strings.isNullOrEmpty(emitterType)) {
         // If the emitter is unspecified, we want to default to the no-op emitter. Include empty string here too, just
diff --git a/server/src/main/java/org/apache/druid/server/http/LookupCoordinatorResource.java b/server/src/main/java/org/apache/druid/server/http/LookupCoordinatorResource.java
index e954fb521363..eedf6bc9505c 100644
--- a/server/src/main/java/org/apache/druid/server/http/LookupCoordinatorResource.java
+++ b/server/src/main/java/org/apache/druid/server/http/LookupCoordinatorResource.java
@@ -154,9 +154,7 @@ public Response updateAllLookups(
       final ObjectMapper mapper = isSmile ? smileMapper : jsonMapper;
       final Map<String, Map<String, LookupExtractorFactoryMapContainer>> map;
       try {
-        map = mapper.readValue(in, new TypeReference<Map<String, Map<String, LookupExtractorFactoryMapContainer>>>()
-        {
-        });
+        map = mapper.readValue(in, new TypeReference<>() {});
       }
       catch (IOException e) {
         return Response.status(Response.Status.BAD_REQUEST).entity(ServletResourceUtils.sanitizeException(e)).build();
diff --git a/server/src/main/java/org/apache/druid/server/http/SegmentListerResource.java b/server/src/main/java/org/apache/druid/server/http/SegmentListerResource.java
index 1486355a7768..38911950f024 100644
--- a/server/src/main/java/org/apache/druid/server/http/SegmentListerResource.java
+++ b/server/src/main/java/org/apache/druid/server/http/SegmentListerResource.java
@@ -174,7 +174,7 @@ public void onStartAsync(AsyncEvent event)
 
     Futures.addCallback(
         future,
-        new FutureCallback<ChangeRequestsSnapshot<DataSegmentChangeRequest>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(ChangeRequestsSnapshot<DataSegmentChangeRequest> result)
@@ -287,7 +287,7 @@ public void onStartAsync(AsyncEvent event)
 
     Futures.addCallback(
         future,
-        new FutureCallback<List<DataSegmentChangeResponse>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(List<DataSegmentChangeResponse> result)
diff --git a/server/src/main/java/org/apache/druid/server/http/ServersResource.java b/server/src/main/java/org/apache/druid/server/http/ServersResource.java
index c6b105ad16c6..001ccc177e49 100644
--- a/server/src/main/java/org/apache/druid/server/http/ServersResource.java
+++ b/server/src/main/java/org/apache/druid/server/http/ServersResource.java
@@ -85,12 +85,12 @@ private static Map<String, Object> makeFullServer(DruidServer server)
    */
   private static Map<SegmentId, DataSegment> createLazySegmentsMap(DruidServer server)
   {
-    return new AbstractMap<SegmentId, DataSegment>()
+    return new AbstractMap<>()
     {
       @Override
       public Set<Entry<SegmentId, DataSegment>> entrySet()
       {
-        return new AbstractSet<Entry<SegmentId, DataSegment>>()
+        return new AbstractSet<>()
         {
           @Override
           public Iterator<Entry<SegmentId, DataSegment>> iterator()
diff --git a/server/src/main/java/org/apache/druid/server/http/security/RulesResourceFilter.java b/server/src/main/java/org/apache/druid/server/http/security/RulesResourceFilter.java
index f314c77d7431..e48c38e0260d 100644
--- a/server/src/main/java/org/apache/druid/server/http/security/RulesResourceFilter.java
+++ b/server/src/main/java/org/apache/druid/server/http/security/RulesResourceFilter.java
@@ -58,7 +58,7 @@ public ContainerRequest filter(ContainerRequest request)
                                          .get(
                                              Iterables.indexOf(
                                                  request.getPathSegments(),
-                                                 new Predicate<PathSegment>()
+                                                 new Predicate<>()
                                                  {
                                                    @Override
                                                    public boolean apply(PathSegment input)
diff --git a/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitUtils.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitUtils.java
index b82d79529226..72ddbe9c4387 100644
--- a/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitUtils.java
+++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitUtils.java
@@ -67,14 +67,14 @@ public static GzipHandler wrapWithDefaultGzipHandler(final Handler handler, int
   public static void addQosFilters(ServletContextHandler handler, Injector injector)
   {
     final Set<JettyBindings.QosFilterHolder> filters =
-        injector.getInstance(Key.get(new TypeLiteral<Set<JettyBindings.QosFilterHolder>>() {}));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}));
     addFilters(handler, filters);
   }
 
   public static void addExtensionFilters(ServletContextHandler handler, Injector injector)
   {
     final Set<ServletFilterHolder> filters =
-        injector.getInstance(Key.get(new TypeLiteral<Set<ServletFilterHolder>>() {}));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}));
     addFilters(handler, filters);
   }
 
diff --git a/server/src/main/java/org/apache/druid/server/listener/resource/AbstractListenerHandler.java b/server/src/main/java/org/apache/druid/server/listener/resource/AbstractListenerHandler.java
index 5553b7320c27..1f89fb3f3567 100644
--- a/server/src/main/java/org/apache/druid/server/listener/resource/AbstractListenerHandler.java
+++ b/server/src/main/java/org/apache/druid/server/listener/resource/AbstractListenerHandler.java
@@ -87,7 +87,7 @@ public final Response handlePOSTAll(final InputStream inputStream, final ObjectM
       // Now do the ACTUAL conversion
       inObjMap = ImmutableMap.copyOf(Maps.transformValues(
           tempMap,
-          new Function<Object, ObjType>()
+          new Function<>()
           {
             @Override
             public ObjType apply(Object input)
diff --git a/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java b/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java
index 08eb2b72830d..712874187697 100644
--- a/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java
+++ b/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java
@@ -44,7 +44,7 @@ private DefaultRequestLogEventBuilderFactory()
   @Override
   public ServiceEventBuilder<RequestLogEvent> createRequestLogEventBuilder(String feed, RequestLogLine requestLogLine)
   {
-    return new ServiceEventBuilder<RequestLogEvent>()
+    return new ServiceEventBuilder<>()
     {
       @Override
       public RequestLogEvent build(ImmutableMap<String, String> serviceDimensions)
diff --git a/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java b/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java
index 35a10d9a8f2f..a4fe842f3cb5 100644
--- a/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java
+++ b/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java
@@ -102,7 +102,7 @@ public void start()
           exec,
           initialDelay,
           Duration.standardDays(1),
-          new Callable<ScheduledExecutors.Signal>()
+          new Callable<>()
           {
             @Override
             public ScheduledExecutors.Signal call()
diff --git a/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java
index fcb1a81fd5fe..e914c1382231 100644
--- a/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java
+++ b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java
@@ -104,9 +104,7 @@ public class LookupCoordinatorManager
   private static final String LOOKUP_UPDATE_REQUEST_PATH = LOOKUP_BASE_REQUEST_PATH + "/" + "updates";
 
   private static final TypeReference<LookupsState<LookupExtractorFactoryMapContainer>> LOOKUPS_STATE_TYPE_REFERENCE =
-      new TypeReference<LookupsState<LookupExtractorFactoryMapContainer>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private static final EmittingLogger LOG = new EmittingLogger(LookupCoordinatorManager.class);
 
@@ -321,7 +319,7 @@ public Collection<HostAndPort> discoverNodesInTier(String tier)
     Preconditions.checkState(lifecycleLock.awaitStarted(5, TimeUnit.SECONDS), "not started");
     return Collections2.transform(
         lookupNodeDiscovery.getNodesInTier(tier),
-        new Function<HostAndPortWithScheme, HostAndPort>()
+        new Function<>()
         {
           @Override
           public HostAndPort apply(HostAndPortWithScheme input)
@@ -490,9 +488,7 @@ private void initializeLookupsConfigWatcher()
     //Note: this call is idempotent, so multiple start() would not cause any problems.
     lookupMapConfigRef = configManager.watch(
         LOOKUP_CONFIG_KEY,
-        new TypeReference<Map<String, Map<String, LookupExtractorFactoryMapContainer>>>()
-        {
-        },
+        new TypeReference<>() {},
         null
     );
 
diff --git a/server/src/main/java/org/apache/druid/server/security/TLSCertificateCheckerModule.java b/server/src/main/java/org/apache/druid/server/security/TLSCertificateCheckerModule.java
index c8a7c9a14946..c59c21ce0c79 100644
--- a/server/src/main/java/org/apache/druid/server/security/TLSCertificateCheckerModule.java
+++ b/server/src/main/java/org/apache/druid/server/security/TLSCertificateCheckerModule.java
@@ -76,7 +76,9 @@ public TLSCertificateCheckerProvider(
     @Inject
     public void inject(Injector injector)
     {
-      final List<Binding<TLSCertificateChecker>> checkerBindings = injector.findBindingsByType(new TypeLiteral<TLSCertificateChecker>(){});
+      final List<Binding<TLSCertificateChecker>> checkerBindings = injector.findBindingsByType(new TypeLiteral<>()
+      {
+      });
 
       checker = findChecker(checkerType, checkerBindings);
       if (checker == null) {
diff --git a/server/src/test/java/org/apache/druid/catalog/model/PropertyDefnTest.java b/server/src/test/java/org/apache/druid/catalog/model/PropertyDefnTest.java
index 99714f0411ef..a8b78826e010 100644
--- a/server/src/test/java/org/apache/druid/catalog/model/PropertyDefnTest.java
+++ b/server/src/test/java/org/apache/druid/catalog/model/PropertyDefnTest.java
@@ -117,10 +117,10 @@ public void testStringList()
   @Test
   public void testClusterKeyList()
   {
-    ListPropertyDefn<ClusterKeySpec> prop = new ListPropertyDefn<ClusterKeySpec>(
+    ListPropertyDefn<ClusterKeySpec> prop = new ListPropertyDefn<>(
         "prop",
         "cluster key list",
-        new TypeReference<List<ClusterKeySpec>>() { }
+        new TypeReference<>() {}
     );
     assertEquals("prop", prop.name());
     assertEquals("cluster key list", prop.typeName());
diff --git a/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java b/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java
index e6d67d7d91d2..d5be2c269f31 100644
--- a/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java
+++ b/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java
@@ -273,7 +273,7 @@ public static Iterable<Object[]> constructorFeeder()
   {
     return Lists.transform(
         Lists.newArrayList(new RangeIterable(RANDOMNESS)),
-        new Function<Integer, Object[]>()
+        new Function<>()
         {
           @Override
           public Object[] apply(Integer input)
@@ -1900,7 +1900,7 @@ public void testQueryCachingWithFilter(
             results.add(expectation.getResults());
           }
           EasyMock.expect(queryable.run(EasyMock.capture(capture), EasyMock.capture(context)))
-                  .andAnswer(new IAnswer<Sequence>()
+                  .andAnswer(new IAnswer<>()
                   {
                     @Override
                     public Sequence answer()
@@ -2259,7 +2259,7 @@ private Sequence<Result<TimeseriesResultValue>> toQueryableTimeseriesResults(
               .trinaryTransform(
                   intervals,
                   results,
-                  new TrinaryFn<SegmentId, Interval, Iterable<Result<TimeseriesResultValue>>, Result<TimeseriesResultValue>>()
+                  new TrinaryFn<>()
                   {
                     @Override
                     @SuppressWarnings("unchecked")
@@ -2298,7 +2298,7 @@ private Sequence<Result<TopNResultValue>> toQueryableTopNResults(
             .trinaryTransform(
                 intervals,
                 results,
-                new TrinaryFn<SegmentId, Interval, Iterable<Result<TopNResultValue>>, Result<TopNResultValue>>()
+                new TrinaryFn<>()
                 {
                   @Override
                   @SuppressWarnings("unchecked")
@@ -2334,7 +2334,7 @@ private Sequence<Result<SearchResultValue>> toQueryableSearchResults(
             .trinaryTransform(
                 intervals,
                 results,
-                new TrinaryFn<SegmentId, Interval, Iterable<Result<SearchResultValue>>, Result<SearchResultValue>>()
+                new TrinaryFn<>()
                 {
                   @Override
                   @SuppressWarnings("unchecked")
@@ -2371,7 +2371,7 @@ private Sequence<Result> toQueryableGroupByResults(
             .trinaryTransform(
                 intervals,
                 results,
-                new TrinaryFn<SegmentId, Interval, Iterable<ResultRow>, Result>()
+                new TrinaryFn<>()
                 {
                   @Override
                   @SuppressWarnings("unchecked")
@@ -2415,7 +2415,7 @@ private Sequence<Result<TimeBoundaryResultValue>> toQueryableTimeBoundaryResults
             .trinaryTransform(
                 intervals,
                 results,
-                new TrinaryFn<SegmentId, Interval, Iterable<Result<TimeBoundaryResultValue>>, Result<TimeBoundaryResultValue>>()
+                new TrinaryFn<>()
                 {
                   @Override
                   @SuppressWarnings("unchecked")
diff --git a/server/src/test/java/org/apache/druid/client/CoordinatorServerViewTest.java b/server/src/test/java/org/apache/druid/client/CoordinatorServerViewTest.java
index df58f0519390..19ad1c8a45f0 100644
--- a/server/src/test/java/org/apache/druid/client/CoordinatorServerViewTest.java
+++ b/server/src/test/java/org/apache/druid/client/CoordinatorServerViewTest.java
@@ -197,7 +197,7 @@ public void testMultipleServerAddedRemovedSegment() throws Exception
 
     final List<DruidServer> druidServers = Lists.transform(
         ImmutableList.of("localhost:0", "localhost:1", "localhost:2", "localhost:3", "localhost:4"),
-        new Function<String, DruidServer>()
+        new Function<>()
         {
           @Override
           public DruidServer apply(String input)
@@ -226,7 +226,7 @@ public DruidServer apply(String input)
             Pair.of("2011-04-01/2011-04-09", "v2"),
             Pair.of("2011-04-06/2011-04-09", "v3"),
             Pair.of("2011-04-01/2011-04-02", "v3")
-        ), new Function<Pair<String, String>, DataSegment>()
+        ), new Function<>()
         {
           @Override
           public DataSegment apply(Pair<String, String> input)
diff --git a/server/src/test/java/org/apache/druid/client/JsonParserIteratorTest.java b/server/src/test/java/org/apache/druid/client/JsonParserIteratorTest.java
index ab0e44c04303..ff617d9eaccf 100644
--- a/server/src/test/java/org/apache/druid/client/JsonParserIteratorTest.java
+++ b/server/src/test/java/org/apache/druid/client/JsonParserIteratorTest.java
@@ -254,7 +254,7 @@ public void testTimeoutBeforeCallingFuture()
     @Test
     public void testTimeoutWhileCallingFuture()
     {
-      Future<InputStream> future = new AbstractFuture<InputStream>()
+      Future<InputStream> future = new AbstractFuture<>()
       {
         @Override
         public InputStream get(long timeout, TimeUnit unit)
diff --git a/server/src/test/java/org/apache/druid/client/RangeIterable.java b/server/src/test/java/org/apache/druid/client/RangeIterable.java
index 64ec9d93481b..4cabb0f2fd86 100644
--- a/server/src/test/java/org/apache/druid/client/RangeIterable.java
+++ b/server/src/test/java/org/apache/druid/client/RangeIterable.java
@@ -58,7 +58,7 @@ public RangeIterable(
   @Override
   public Iterator<Integer> iterator()
   {
-    return new Iterator<Integer>()
+    return new Iterator<>()
     {
       private int curr = start;
 
diff --git a/server/src/test/java/org/apache/druid/client/cache/BytesBoundedLinkedQueueTest.java b/server/src/test/java/org/apache/druid/client/cache/BytesBoundedLinkedQueueTest.java
index b01ad7993117..b4c1ea833630 100644
--- a/server/src/test/java/org/apache/druid/client/cache/BytesBoundedLinkedQueueTest.java
+++ b/server/src/test/java/org/apache/druid/client/cache/BytesBoundedLinkedQueueTest.java
@@ -45,7 +45,7 @@ public class BytesBoundedLinkedQueueTest
 
   private static BlockingQueue<TestObject> getQueue(final int capacity)
   {
-    return new BytesBoundedLinkedQueue<TestObject>(capacity)
+    return new BytesBoundedLinkedQueue<>(capacity)
     {
       @Override
       public long getBytesSize(TestObject o)
@@ -91,7 +91,7 @@ public void testTake() throws Exception
     final CountDownLatch latch = new CountDownLatch(1);
     final TestObject object = new TestObject(4);
     Future<TestObject> future = exec.submit(
-        new Callable<TestObject>()
+        new Callable<>()
         {
           @Override
           public TestObject call() throws Exception
@@ -139,7 +139,7 @@ public void testOfferAndPut() throws Exception
     final CyclicBarrier barrier = new CyclicBarrier(2);
 
     Future<Boolean> future = exec.submit(
-        new Callable<Boolean>()
+        new Callable<>()
         {
           @Override
           public Boolean call() throws Exception
diff --git a/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java b/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java
index 7c1cfebae97a..f87c7b679cc5 100644
--- a/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java
+++ b/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java
@@ -352,7 +352,7 @@ public Cache get()
 
 class MockMemcachedClient implements MemcachedClientIF
 {
-  private final ConcurrentMap<String, CachedData> theMap = new ConcurrentHashMap<String, CachedData>();
+  private final ConcurrentMap<String, CachedData> theMap = new ConcurrentHashMap<>();
   private final SerializingTranscoder transcoder;
 
   public MockMemcachedClient()
@@ -504,7 +504,7 @@ public <T> Future<Boolean> set(String key, int exp, T o, Transcoder<T> tc)
   {
     theMap.put(key, tc.encode(o));
 
-    return new Future<Boolean>()
+    return new Future<>()
     {
       @Override
       public boolean cancel(boolean b)
@@ -562,7 +562,7 @@ public <T> Future<T> asyncGet(String key, final Transcoder<T> tc)
     CachedData data = theMap.get(key);
     final T theValue = data != null ? tc.decode(data) : null;
 
-    return new Future<T>()
+    return new Future<>()
     {
       @Override
       public boolean cancel(boolean b)
@@ -678,7 +678,7 @@ public <T> BulkFuture<Map<String, T>> asyncGetBulk(Collection<String> keys, Iter
   @Override
   public <T> BulkFuture<Map<String, T>> asyncGetBulk(final Iterator<String> keys, final Transcoder<T> tc)
   {
-    return new BulkFuture<Map<String, T>>()
+    return new BulkFuture<>()
     {
       @Override
       public boolean isTimeout()
diff --git a/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java b/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java
index 330fe98332de..86ee872dafed 100644
--- a/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java
+++ b/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java
@@ -197,7 +197,7 @@ public String getBase()
         },
         cf,
         jsonMapper,
-        new Predicate<Pair<DruidServerMetadata, DataSegment>>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(@Nullable Pair<DruidServerMetadata, DataSegment> input)
@@ -324,7 +324,7 @@ public void testRunWithFilterCallback() throws Exception
             )
         )
         .andAnswer(
-            new IAnswer<ServerView.CallbackAction>()
+            new IAnswer<>()
             {
               @Override
               public ServerView.CallbackAction answer()
@@ -342,7 +342,7 @@ public ServerView.CallbackAction answer()
     filteredBatchServerInventoryView.registerSegmentCallback(
         Execs.directExecutor(),
         callback,
-        new Predicate<Pair<DruidServerMetadata, DataSegment>>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(@Nullable Pair<DruidServerMetadata, DataSegment> input)
@@ -443,7 +443,7 @@ public void testSameTimeZnode() throws Exception
       final int ii = i;
       futures.add(
           executor.submit(
-              new Callable<BatchDataSegmentAnnouncer>()
+              new Callable<>()
               {
                 @Override
                 public BatchDataSegmentAnnouncer call()
@@ -477,7 +477,7 @@ public String getBase()
                       announcer,
                       jsonMapper
                   );
-                  List<DataSegment> segments = new ArrayList<DataSegment>();
+                  List<DataSegment> segments = new ArrayList<>();
                   try {
                     for (int j = 0; j < INITIAL_SEGMENTS / numThreads; ++j) {
                       segments.add(makeSegment(INITIAL_SEGMENTS + ii + numThreads * j));
diff --git a/server/src/test/java/org/apache/druid/guice/JoinableFactoryModuleTest.java b/server/src/test/java/org/apache/druid/guice/JoinableFactoryModuleTest.java
index 4c2727f07d2d..71dca5020189 100644
--- a/server/src/test/java/org/apache/druid/guice/JoinableFactoryModuleTest.java
+++ b/server/src/test/java/org/apache/druid/guice/JoinableFactoryModuleTest.java
@@ -72,10 +72,10 @@ public void testInjectJoinableFactoryIsSingleton()
   public void testInjectDefaultBindingsShouldBeInjected()
   {
     final Set<JoinableFactory> factories =
-        injector.getInstance(Key.get(new TypeLiteral<Set<JoinableFactory>>() {}));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertEquals(JoinableFactoryModule.FACTORY_MAPPINGS.size(), factories.size());
     Map<Class<? extends JoinableFactory>, Class<? extends DataSource>> joinableFactoriesMappings = injector.getInstance(
-        Key.get(new TypeLiteral<Map<Class<? extends JoinableFactory>, Class<? extends DataSource>>>() {})
+        Key.get(new TypeLiteral<>() {})
     );
     assertDefaultFactories(joinableFactoriesMappings);
   }
@@ -90,9 +90,9 @@ public void testJoinableFactoryCanBind()
         }
     );
     Map<Class<? extends JoinableFactory>, Class<? extends DataSource>> joinableFactoriesMappings = injector.getInstance(
-        Key.get(new TypeLiteral<Map<Class<? extends JoinableFactory>, Class<? extends DataSource>>>() {})
+        Key.get(new TypeLiteral<>() {})
     );
-    Set<JoinableFactory> factories = injector.getInstance(Key.get(new TypeLiteral<Set<JoinableFactory>>() {}));
+    Set<JoinableFactory> factories = injector.getInstance(Key.get(new TypeLiteral<>() {}));
 
     Assert.assertEquals(JoinableFactoryModule.FACTORY_MAPPINGS.size() + 1, factories.size());
     Assert.assertEquals(NoopDataSource.class, joinableFactoriesMappings.get(NoopJoinableFactory.class));
diff --git a/server/src/test/java/org/apache/druid/initialization/ServerInjectorBuilderTest.java b/server/src/test/java/org/apache/druid/initialization/ServerInjectorBuilderTest.java
index b45424b075bc..b8fd387888c2 100644
--- a/server/src/test/java/org/apache/druid/initialization/ServerInjectorBuilderTest.java
+++ b/server/src/test/java/org/apache/druid/initialization/ServerInjectorBuilderTest.java
@@ -67,7 +67,7 @@ public void test03ClassLoaderExtensionsLoading()
     Injector startupInjector = startupInjector();
     ExtensionsLoader extnLoader = ExtensionsLoader.instance(startupInjector);
 
-    Function<DruidModule, String> fnClassName = new Function<DruidModule, String>()
+    Function<DruidModule, String> fnClassName = new Function<>()
     {
       @Nullable
       @Override
diff --git a/server/src/test/java/org/apache/druid/messages/MessageBatchTest.java b/server/src/test/java/org/apache/druid/messages/MessageBatchTest.java
index bcf9fb3423d1..840ee9b88724 100644
--- a/server/src/test/java/org/apache/druid/messages/MessageBatchTest.java
+++ b/server/src/test/java/org/apache/druid/messages/MessageBatchTest.java
@@ -37,7 +37,7 @@ public void test_serde() throws IOException
     final ObjectMapper objectMapper = TestHelper.JSON_MAPPER;
     final MessageBatch<String> batch = new MessageBatch<>(ImmutableList.of("foo", "bar"), 123L, 456L);
     final MessageBatch<String> batch2 =
-        objectMapper.readValue(objectMapper.writeValueAsBytes(batch), new TypeReference<MessageBatch<String>>() {});
+        objectMapper.readValue(objectMapper.writeValueAsBytes(batch), new TypeReference<>() {});
     Assert.assertEquals(batch, batch2);
   }
 
diff --git a/server/src/test/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerTest.java b/server/src/test/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerTest.java
index 8117d6dcb735..56ff7751efb3 100644
--- a/server/src/test/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerTest.java
+++ b/server/src/test/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerTest.java
@@ -80,30 +80,24 @@ public void setUp()
     handler = new DerbyMetadataStorageActionHandler<>(
         connector,
         JSON_MAPPER,
-        new MetadataStorageActionHandlerTypes<Map<String, Object>, Map<String, Object>, Map<String, String>, Map<String, Object>>()
+        new MetadataStorageActionHandlerTypes<>()
         {
           @Override
           public TypeReference<Map<String, Object>> getEntryType()
           {
-            return new TypeReference<Map<String, Object>>()
-            {
-            };
+            return new TypeReference<>() {};
           }
 
           @Override
           public TypeReference<Map<String, Object>> getStatusType()
           {
-            return new TypeReference<Map<String, Object>>()
-            {
-            };
+            return new TypeReference<>() {};
           }
 
           @Override
           public TypeReference<Map<String, Object>> getLockType()
           {
-            return new TypeReference<Map<String, Object>>()
-            {
-            };
+            return new TypeReference<>() {};
           }
         },
         entryType,
diff --git a/server/src/test/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalkerTest.java b/server/src/test/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalkerTest.java
index 99ec5a4068f9..3ad88baf81ec 100644
--- a/server/src/test/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalkerTest.java
+++ b/server/src/test/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalkerTest.java
@@ -376,7 +376,8 @@ private List<SegmentAnalysis> toSegmentAnalysis(List<ServerExpectation> serverEx
       SegmentAnalysis mockSegmentAnalysis = EasyMock.mock(SegmentAnalysis.class);
       EasyMock.expect(mockSegmentAnalysis.getId()).andReturn(serverExpectation.getSegmentId().toString()).anyTimes();
       EasyMock.expect(mockSegmentAnalysis.compareTo(EasyMock.isA(SegmentAnalysis.class)))
-          .andAnswer(new IAnswer<Integer>() {
+          .andAnswer(new IAnswer<>()
+          {
             @Override
             public Integer answer()
             {
diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java
index ed3fe97d6ccb..a5b4709e919a 100644
--- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java
+++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java
@@ -497,7 +497,7 @@ public ListenableFuture<SegmentsAndCommitMetadata> push(
         );
       } else {
         if (interruptPush) {
-          return new AbstractFuture<SegmentsAndCommitMetadata>()
+          return new AbstractFuture<>()
           {
             @Override
             public SegmentsAndCommitMetadata get(long timeout, TimeUnit unit)
diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java
index eaa24af3d6c5..f9c7445a60a1 100644
--- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java
+++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java
@@ -812,7 +812,7 @@ public void testMaxRowsInMemory() throws Exception
                                                   .build()) {
       final Appenderator appenderator = tester.getAppenderator();
       final AtomicInteger eventCount = new AtomicInteger(0);
-      final Supplier<Committer> committerSupplier = new Supplier<Committer>()
+      final Supplier<Committer> committerSupplier = new Supplier<>()
       {
         @Override
         public Committer get()
@@ -920,7 +920,7 @@ public void testRestoreFromDisk() throws Exception
       tuningConfig = tester.getTuningConfig();
 
       final AtomicInteger eventCount = new AtomicInteger(0);
-      final Supplier<Committer> committerSupplier = new Supplier<Committer>()
+      final Supplier<Committer> committerSupplier = new Supplier<>()
       {
         @Override
         public Committer get()
@@ -2352,7 +2352,7 @@ static InputRow ir(String ts, String dim, Object met)
 
   private static Supplier<Committer> committerSupplierFromConcurrentMap(final ConcurrentMap<String, String> map)
   {
-    return new Supplier<Committer>()
+    return new Supplier<>()
     {
       @Override
       public Committer get()
diff --git a/server/src/test/java/org/apache/druid/server/ClientInfoResourceTest.java b/server/src/test/java/org/apache/druid/server/ClientInfoResourceTest.java
index f6c880c0e205..534b58daae4b 100644
--- a/server/src/test/java/org/apache/druid/server/ClientInfoResourceTest.java
+++ b/server/src/test/java/org/apache/druid/server/ClientInfoResourceTest.java
@@ -369,7 +369,7 @@ private void addSegment(
                                      .build();
     server.addDataSegment(segment);
     ServerSelector ss = new ServerSelector(segment, new HighestPriorityTierSelectorStrategy(new RandomServerSelectorStrategy()));
-    timeline.add(Intervals.of(interval), version, new SingleElementPartitionChunk<ServerSelector>(ss));
+    timeline.add(Intervals.of(interval), version, new SingleElementPartitionChunk<>(ss));
   }
 
   private void addSegmentWithShardSpec(
diff --git a/server/src/test/java/org/apache/druid/server/QueryResourceTest.java b/server/src/test/java/org/apache/druid/server/QueryResourceTest.java
index 03af2dcea0ee..b5580f90dfec 100644
--- a/server/src/test/java/org/apache/druid/server/QueryResourceTest.java
+++ b/server/src/test/java/org/apache/druid/server/QueryResourceTest.java
@@ -298,9 +298,7 @@ public void testGoodQueryWithQueryConfigOverrideDefault() throws IOException
 
     final List<Result<TimeBoundaryResultValue>> responses = jsonMapper.readValue(
         response.baos.toByteArray(),
-        new TypeReference<List<Result<TimeBoundaryResultValue>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(0, responses.size());
@@ -625,9 +623,7 @@ public void testGoodQueryWithQueryConfigDoesNotOverrideQueryContext() throws IOE
 
     final List<Result<TimeBoundaryResultValue>> responses = jsonMapper.readValue(
         response.baos.toByteArray(),
-        new TypeReference<List<Result<TimeBoundaryResultValue>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     Assert.assertNotNull(response);
@@ -876,9 +872,7 @@ public Access authorize(AuthenticationResult authenticationResult, Resource reso
 
     final List<Result<TimeBoundaryResultValue>> responses = jsonMapper.readValue(
         response.baos.toByteArray(),
-        new TypeReference<List<Result<TimeBoundaryResultValue>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(0, responses.size());
diff --git a/server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java b/server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java
index 5b123b7cc2ac..008366392026 100644
--- a/server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java
+++ b/server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java
@@ -61,7 +61,7 @@ public void testResultPusherRetainsNestedExceptionBacktraces()
     QueryResource.QueryMetricCounter counter = new NoopQueryMetricCounter();
     String queryId = "someQuery";
     MediaType contentType = MediaType.APPLICATION_JSON_TYPE;
-    Map<String, String> extraHeaders = new HashMap<String, String>();
+    Map<String, String> extraHeaders = new HashMap<>();
     AtomicBoolean recordFailureInvoked = new AtomicBoolean();
 
     String embeddedExceptionMessage = "Embedded Exception Message!";
diff --git a/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java b/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
index b670cd4dd787..40865155e55b 100644
--- a/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
+++ b/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
@@ -667,12 +667,12 @@ private Sequence<Integer> makeSequence(int count)
   {
     return new LazySequence<>(() -> {
       return new BaseSequence<>(
-          new BaseSequence.IteratorMaker<Integer, Iterator<Integer>>()
+          new BaseSequence.IteratorMaker<>()
           {
             @Override
             public Iterator<Integer> make()
             {
-              return new Iterator<Integer>()
+              return new Iterator<>()
               {
                 int rowCounter = 0;
 
@@ -705,12 +705,12 @@ private Sequence<Integer> makeExplodingSequence(int explodeAfter)
   {
     final int explodeAt = explodeAfter + 1;
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<Integer, Iterator<Integer>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<Integer> make()
           {
-            return new Iterator<Integer>()
+            return new Iterator<>()
             {
               int rowCounter = 0;
 
diff --git a/server/src/test/java/org/apache/druid/server/StatusResourceTest.java b/server/src/test/java/org/apache/druid/server/StatusResourceTest.java
index 8ea8da4b78c7..41c52382f557 100644
--- a/server/src/test/java/org/apache/druid/server/StatusResourceTest.java
+++ b/server/src/test/java/org/apache/druid/server/StatusResourceTest.java
@@ -94,7 +94,8 @@ private void testHiddenPropertiesWithPropertyFileName(String fileName) throws Ex
 
     Set<String> hiddenProperties = new ObjectMapper().readValue(
         returnedProperties.get("druid.server.hiddenProperties"),
-        new TypeReference<Set<String>>() {});
+        new TypeReference<>() {}
+    );
 
     hiddenProperties.forEach(
         (property) -> {
diff --git a/server/src/test/java/org/apache/druid/server/compaction/NewestSegmentFirstPolicyTest.java b/server/src/test/java/org/apache/druid/server/compaction/NewestSegmentFirstPolicyTest.java
index 5659a0ff5bfc..d866f996eaf8 100644
--- a/server/src/test/java/org/apache/druid/server/compaction/NewestSegmentFirstPolicyTest.java
+++ b/server/src/test/java/org/apache/druid/server/compaction/NewestSegmentFirstPolicyTest.java
@@ -1237,7 +1237,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil
                     partitionsSpec,
                     null,
                     null,
-                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(new SelectorDimFilter("dim1", "foo", null), null)), new TypeReference<Map<String, Object>>() {}),
+                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(new SelectorDimFilter("dim1", "foo", null), null)), new TypeReference<>() {}),
                     indexSpec,
                     null
                 )
@@ -1250,7 +1250,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil
                     partitionsSpec,
                     null,
                     null,
-                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(new SelectorDimFilter("dim1", "bar", null), null)), new TypeReference<Map<String, Object>>() {}),
+                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(new SelectorDimFilter("dim1", "bar", null), null)), new TypeReference<>() {}),
                     indexSpec,
                     null
                 )
@@ -1263,7 +1263,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil
                     partitionsSpec,
                     null,
                     null,
-                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(null, null)), new TypeReference<Map<String, Object>>() {}),
+                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(null, null)), new TypeReference<>() {}),
                     indexSpec,
                     null
                 )
@@ -1346,7 +1346,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet
                 new CompactionState(
                     partitionsSpec,
                     null,
-                    mapper.convertValue(new AggregatorFactory[] {new CountAggregatorFactory("cnt")}, new TypeReference<List<Object>>() {}),
+                    mapper.convertValue(new AggregatorFactory[] {new CountAggregatorFactory("cnt")}, new TypeReference<>() {}),
                     null,
                     indexSpec,
                     null
@@ -1359,7 +1359,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet
                 new CompactionState(
                     partitionsSpec,
                     null,
-                    mapper.convertValue(new AggregatorFactory[] {new CountAggregatorFactory("cnt"), new LongSumAggregatorFactory("val", "val")}, new TypeReference<List<Object>>() {}),
+                    mapper.convertValue(new AggregatorFactory[] {new CountAggregatorFactory("cnt"), new LongSumAggregatorFactory("val", "val")}, new TypeReference<>() {}),
                     null,
                     indexSpec,
                     null
@@ -1372,7 +1372,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet
                 new CompactionState(
                     partitionsSpec,
                     null,
-                    mapper.convertValue(new AggregatorFactory[] {}, new TypeReference<List<Object>>() {}),
+                    mapper.convertValue(new AggregatorFactory[] {}, new TypeReference<>() {}),
                     null,
                     indexSpec,
                     null
@@ -1464,7 +1464,7 @@ public void testIteratorReturnsSegmentsAsCompactionStateChangedWithCompactedStat
   {
     // Different indexSpec as what is set in the auto compaction config
     IndexSpec newIndexSpec = IndexSpec.builder().withBitmapSerdeFactory(new ConciseBitmapSerdeFactory()).build();
-    Map<String, Object> newIndexSpecMap = mapper.convertValue(newIndexSpec, new TypeReference<Map<String, Object>>() {});
+    Map<String, Object> newIndexSpecMap = mapper.convertValue(newIndexSpec, new TypeReference<>() {});
     PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null));
 
     // Create segments that were compacted (CompactionState != null) and have segmentGranularity=DAY
diff --git a/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHistoryTest.java b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHistoryTest.java
index 40af9d8b4369..8bd95d19d591 100644
--- a/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHistoryTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHistoryTest.java
@@ -136,7 +136,7 @@ public void testCancel()
     final AtomicBoolean callbackExcecuted = new AtomicBoolean(false);
     Futures.addCallback(
         future,
-        new FutureCallback<ChangeRequestsSnapshot<DataSegmentChangeRequest>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(ChangeRequestsSnapshot result)
@@ -194,7 +194,7 @@ public void testStop()
     final AtomicBoolean callbackExcecuted = new AtomicBoolean(false);
     Futures.addCallback(
         future,
-        new FutureCallback<ChangeRequestsSnapshot<DataSegmentChangeRequest>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(ChangeRequestsSnapshot result)
diff --git a/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncerTest.java b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncerTest.java
index f4dd564e13ea..b96e51f0c91f 100644
--- a/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncerTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncerTest.java
@@ -54,9 +54,7 @@ public class ChangeRequestHttpSyncerTest
   public void testSimple() throws Exception
   {
     ObjectMapper jsonMapper = TestHelper.makeJsonMapper();
-    TypeReference<ChangeRequestsSnapshot<String>> typeRef = new TypeReference<ChangeRequestsSnapshot<String>>()
-    {
-    };
+    TypeReference<ChangeRequestsSnapshot<String>> typeRef = new TypeReference<>() {};
 
     TestHttpClient httpClient = new TestHttpClient(
         ImmutableList.of(
diff --git a/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java b/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java
index 2e20b907184e..e93f08c03de6 100644
--- a/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java
@@ -588,7 +588,7 @@ public void testGetQueryRunnerForSegmentsForUnknownQueryThrowingException()
     expectedException.expect(QueryUnsupportedException.class);
     expectedException.expectMessage("Unknown query type");
     serverManager.getQueryRunnerForSegments(
-        new BaseQuery<Object>(
+        new BaseQuery<>(
             new TableDataSource("test"),
             new MultipleSpecificSegmentSpec(descriptors),
             new HashMap<>()
@@ -864,9 +864,7 @@ public Function<T, T> makePreComputeManipulatorFn(QueryType query, MetricManipul
     @Override
     public TypeReference<T> getResultTypeReference()
     {
-      return new TypeReference<T>()
-      {
-      };
+      return new TypeReference<>() {};
     }
   }
 
@@ -934,7 +932,7 @@ public <OutType> Yielder<OutType> toYielder(
       }
 
       final Yielder<OutType> baseYielder = baseSequence.toYielder(initValue, accumulator);
-      return new Yielder<OutType>()
+      return new Yielder<>()
       {
         @Override
         public OutType get()
diff --git a/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java b/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
index 986252d75502..98644cdc5655 100644
--- a/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
@@ -606,9 +606,7 @@ public Set<DataSegment> read(String path)
       try {
         if (cf.checkExists().forPath(path) != null) {
           return jsonMapper.readValue(
-              cf.getData().forPath(path), new TypeReference<Set<DataSegment>>()
-              {
-              }
+              cf.getData().forPath(path), new TypeReference<>() {}
           );
         }
       }
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java b/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java
index 31789dd540ca..882bb87a25a5 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java
@@ -271,7 +271,7 @@ public void testRun()
     final TestOverlordClient overlordClient = new TestOverlordClient(JSON_MAPPER);
     final CompactSegments compactSegments = new CompactSegments(statusTracker, overlordClient);
 
-    final Supplier<String> expectedVersionSupplier = new Supplier<String>()
+    final Supplier<String> expectedVersionSupplier = new Supplier<>()
     {
       private int i = 0;
 
@@ -2175,9 +2175,7 @@ private void compactSegments(
           transformSpec = jsonMapper.readValue(
               jsonMapper.writeValueAsString(new TransformSpec(clientCompactionTaskQuery.getTransformSpec()
                                                                                        .getFilter(), null)),
-              new TypeReference<Map<String, Object>>()
-              {
-              }
+              new TypeReference<>() {}
           );
         }
       }
@@ -2187,7 +2185,7 @@ private void compactSegments(
 
       List<Object> metricsSpec = null;
       if (clientCompactionTaskQuery.getMetricsSpec() != null) {
-        metricsSpec = jsonMapper.convertValue(clientCompactionTaskQuery.getMetricsSpec(), new TypeReference<List<Object>>() {});
+        metricsSpec = jsonMapper.convertValue(clientCompactionTaskQuery.getMetricsSpec(), new TypeReference<>() {});
       }
 
       for (int i = 0; i < 2; i++) {
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/loading/CuratorLoadQueuePeonTest.java b/server/src/test/java/org/apache/druid/server/coordinator/loading/CuratorLoadQueuePeonTest.java
index e22b037707ae..4de59af1f2d3 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/loading/CuratorLoadQueuePeonTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/loading/CuratorLoadQueuePeonTest.java
@@ -105,7 +105,7 @@ public void testMultipleLoadDropSegments() throws Exception
             "2014-10-24T00:00:00Z/P1D",
             "2014-10-23T00:00:00Z/P1D",
             "2014-10-22T00:00:00Z/P1D"
-        ), new Function<String, DataSegment>()
+        ), new Function<>()
         {
           @Override
           public DataSegment apply(String intervalStr)
@@ -135,7 +135,7 @@ public DataSegment apply(String intervalStr)
             "2014-10-31T00:00:00Z/P1D",
             "2014-10-30T00:00:00Z/P1D",
             "2014-10-28T00:00:00Z/P1D"
-        ), new Function<String, DataSegment>()
+        ), new Function<>()
         {
           @Override
           public DataSegment apply(String intervalStr)
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java b/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java
index f2405060fea8..e156ba25b5cc 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java
@@ -61,7 +61,7 @@ public void testSerde() throws IOException
   {
     final List<Rule> rules = Collections.singletonList(testRule);
     final String json = MAPPER.writeValueAsString(rules);
-    final List<Rule> fromJson = MAPPER.readValue(json, new TypeReference<List<Rule>>(){});
+    final List<Rule> fromJson = MAPPER.readValue(json, new TypeReference<>() {});
     Assert.assertEquals(rules, fromJson);
   }
 }
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentLoadingHttpClient.java b/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentLoadingHttpClient.java
index f7007bfd833d..5caa90d8dfdb 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentLoadingHttpClient.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentLoadingHttpClient.java
@@ -134,9 +134,7 @@ private List<DataSegmentChangeResponse> processRequest(
   {
     final List<DataSegmentChangeRequest> changeRequests = objectMapper.readValue(
         request.getContent().array(),
-        new TypeReference<List<DataSegmentChangeRequest>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     return changeRequests
diff --git a/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java b/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java
index f6bccbeb7da4..4d7939021491 100644
--- a/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java
+++ b/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java
@@ -677,7 +677,7 @@ public void testIsHandOffComplete()
     SegmentLoadInfo segmentLoadInfo = new SegmentLoadInfo(createSegment(Intervals.of(interval3), "v1", 1));
     segmentLoadInfo.addServer(createHistoricalServerMetadata("test"));
     VersionedIntervalTimeline<String, SegmentLoadInfo> timeline =
-        new VersionedIntervalTimeline<String, SegmentLoadInfo>(null)
+        new VersionedIntervalTimeline<>(null)
     {
       @Override
       public List<TimelineObjectHolder<String, SegmentLoadInfo>> lookupWithIncompletePartitions(Interval interval)
diff --git a/server/src/test/java/org/apache/druid/server/http/security/ResourceFilterTestHelper.java b/server/src/test/java/org/apache/druid/server/http/security/ResourceFilterTestHelper.java
index 95a0cc29e31a..82b15bd453a9 100644
--- a/server/src/test/java/org/apache/druid/server/http/security/ResourceFilterTestHelper.java
+++ b/server/src/test/java/org/apache/druid/server/http/security/ResourceFilterTestHelper.java
@@ -86,7 +86,7 @@ public void setUpMockExpectations(
         ImmutableList.copyOf(
             Iterables.transform(
                 Arrays.asList(requestPath.split("/")),
-                new Function<String, PathSegment>()
+                new Function<>()
                 {
                   @Override
                   public PathSegment apply(final String input)
@@ -209,7 +209,7 @@ public void configure(Binder binder)
                     // and also the endpoints that does not have any
                     // ResourceFilters applied to them
                     methods,
-                    new Predicate<Method>()
+                    new Predicate<>()
                     {
                       @Override
                       public boolean apply(Method input)
@@ -233,7 +233,7 @@ public Collection<Object[]> apply(final Method method)
 
                     return Collections2.transform(
                         resourceFilters,
-                        new Function<Class<? extends ResourceFilter>, Object[]>()
+                        new Function<>()
                         {
                           @Override
                           public Object[] apply(Class<? extends ResourceFilter> input)
diff --git a/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java b/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java
index a66cdde9487d..2d61ba586a7a 100644
--- a/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java
+++ b/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java
@@ -52,7 +52,7 @@ public void testFilterResourcesWithAllowAllAuthorizer()
     resources.add("filteredResource");
     resources.add("hello");
 
-    Function<String, Iterable<ResourceAction>> resourceActionGenerator = new Function<String, Iterable<ResourceAction>>()
+    Function<String, Iterable<ResourceAction>> resourceActionGenerator = new Function<>()
     {
       @Nullable
       @Override
diff --git a/services/src/main/java/org/apache/druid/cli/CliCoordinator.java b/services/src/main/java/org/apache/druid/cli/CliCoordinator.java
index b819bb0ded7e..207090a06ddf 100644
--- a/services/src/main/java/org/apache/druid/cli/CliCoordinator.java
+++ b/services/src/main/java/org/apache/druid/cli/CliCoordinator.java
@@ -361,13 +361,13 @@ public CoordinatorCustomDutyGroups get()
           return new CoordinatorCustomDutyGroups(coordinatorCustomDutyGroups);
         }
         List<String> coordinatorCustomDutyGroupNames = jsonMapper.readValue(props.getProperty(
-            "druid.coordinator.dutyGroups"), new TypeReference<List<String>>() {});
+            "druid.coordinator.dutyGroups"), new TypeReference<>() {});
         for (String coordinatorCustomDutyGroupName : coordinatorCustomDutyGroupNames) {
           String dutyListProperty = StringUtils.format("druid.coordinator.%s.duties", coordinatorCustomDutyGroupName);
           if (Strings.isNullOrEmpty(props.getProperty(dutyListProperty))) {
             throw new IAE("Coordinator custom duty group given without any duty for group %s", coordinatorCustomDutyGroupName);
           }
-          List<String> dutyForGroup = jsonMapper.readValue(props.getProperty(dutyListProperty), new TypeReference<List<String>>() {});
+          List<String> dutyForGroup = jsonMapper.readValue(props.getProperty(dutyListProperty), new TypeReference<>() {});
           List<CoordinatorCustomDuty> coordinatorCustomDuties = new ArrayList<>();
           for (String dutyName : dutyForGroup) {
             final String dutyPropertyBase = StringUtils.format(
diff --git a/services/src/main/java/org/apache/druid/cli/DumpSegment.java b/services/src/main/java/org/apache/druid/cli/DumpSegment.java
index 5c31f02b6039..a98b9aafdbf6 100644
--- a/services/src/main/java/org/apache/druid/cli/DumpSegment.java
+++ b/services/src/main/java/org/apache/druid/cli/DumpSegment.java
@@ -252,7 +252,7 @@ private void runMetadata(final Injector injector, final QueryableIndex index) th
         null
     );
     withOutputStream(
-        new Function<OutputStream, Object>()
+        new Function<>()
         {
           @Override
           public Object apply(final OutputStream out)
@@ -260,7 +260,7 @@ public Object apply(final OutputStream out)
             evaluateSequenceForSideEffects(
                 Sequences.map(
                     executeQuery(injector, index, query),
-                    new Function<SegmentAnalysis, Object>()
+                    new Function<>()
                     {
                       @Override
                       public Object apply(SegmentAnalysis analysis)
@@ -309,7 +309,7 @@ public static void runDump(
       }
 
       withOutputStream(
-          new Function<OutputStream, Object>()
+          new Function<>()
           {
             @Override
             public Object apply(final OutputStream out)
diff --git a/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java b/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java
index 50684cee0e87..18339246a851 100644
--- a/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java
+++ b/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java
@@ -227,7 +227,7 @@ private Void readData(final StringInputRowParser parser, final CharSource source
       throws IOException
   {
     return source.readLines(
-        new LineProcessor<Void>()
+        new LineProcessor<>()
         {
           private final StringBuilder builder = new StringBuilder();
 
diff --git a/services/src/main/java/org/apache/druid/guice/AbstractDruidServiceModule.java b/services/src/main/java/org/apache/druid/guice/AbstractDruidServiceModule.java
index fb69005675f1..0638d090901a 100644
--- a/services/src/main/java/org/apache/druid/guice/AbstractDruidServiceModule.java
+++ b/services/src/main/java/org/apache/druid/guice/AbstractDruidServiceModule.java
@@ -71,11 +71,11 @@ public static void configure(Binder binder, NodeRole role)
     binder.install(MultibindingsScanner.asModule());
     MapBinder<NodeRole, Set<Class<? extends DruidService>>> serviceBinder = MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<NodeRole>(){},
-        new TypeLiteral<Set<Class<? extends DruidService>>>(){}
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
     serviceBinder
         .addBinding(role)
-        .to(Key.get(new TypeLiteral<Set<Class<? extends DruidService>>>(){}, role.getDruidServiceInjectName()));
+        .to(Key.get(new TypeLiteral<>() {}, role.getDruidServiceInjectName()));
   }
 }
diff --git a/services/src/main/java/org/apache/druid/server/router/CoordinatorRuleManager.java b/services/src/main/java/org/apache/druid/server/router/CoordinatorRuleManager.java
index 44f4605ea71d..f60087024b58 100644
--- a/services/src/main/java/org/apache/druid/server/router/CoordinatorRuleManager.java
+++ b/services/src/main/java/org/apache/druid/server/router/CoordinatorRuleManager.java
@@ -59,9 +59,7 @@ public class CoordinatorRuleManager
   private static final Logger LOG = new Logger(CoordinatorRuleManager.class);
 
   private static final TypeReference<Map<String, List<Rule>>> TYPE_REFERENCE =
-      new TypeReference<Map<String, List<Rule>>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private final ObjectMapper jsonMapper;
   private final Supplier<TieredBrokerConfig> config;
diff --git a/services/src/main/java/org/apache/druid/server/router/TieredBrokerHostSelector.java b/services/src/main/java/org/apache/druid/server/router/TieredBrokerHostSelector.java
index ea7b615187a9..e1732b44fb20 100644
--- a/services/src/main/java/org/apache/druid/server/router/TieredBrokerHostSelector.java
+++ b/services/src/main/java/org/apache/druid/server/router/TieredBrokerHostSelector.java
@@ -68,7 +68,7 @@ public class TieredBrokerHostSelector
 
   private volatile boolean started = false;
 
-  private static final Function<DiscoveryDruidNode, Server> TO_SERVER = new Function<DiscoveryDruidNode, Server>()
+  private static final Function<DiscoveryDruidNode, Server> TO_SERVER = new Function<>()
   {
     @Override
     public Server apply(final DiscoveryDruidNode instance)
@@ -315,7 +315,7 @@ public Map<String, List<Server>> getAllBrokers()
   {
     return Maps.transformValues(
         servers,
-        new Function<NodesHolder, List<Server>>()
+        new Function<>()
         {
           @Override
           public List<Server> apply(NodesHolder input)
diff --git a/services/src/test/java/org/apache/druid/server/router/TieredBrokerHostSelectorTest.java b/services/src/test/java/org/apache/druid/server/router/TieredBrokerHostSelectorTest.java
index 8dbf03292360..20ef4bd9ff25 100644
--- a/services/src/test/java/org/apache/druid/server/router/TieredBrokerHostSelectorTest.java
+++ b/services/src/test/java/org/apache/druid/server/router/TieredBrokerHostSelectorTest.java
@@ -122,7 +122,7 @@ public void registerListener(Listener listener)
           @Override
           public LinkedHashMap<String, String> getTierToBrokerMap()
           {
-            return new LinkedHashMap<String, String>(
+            return new LinkedHashMap<>(
                 ImmutableMap.of(
                     "hot", "hotBroker",
                     "medium", "mediumBroker",
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Bounds.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Bounds.java
index a1c310522c8f..b197a2babcd6 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Bounds.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Bounds.java
@@ -93,7 +93,7 @@ public static List<Range<BoundValue>> toRanges(final List<BoundDimFilter> bounds
     return ImmutableList.copyOf(
         Lists.transform(
             bounds,
-            new Function<BoundDimFilter, Range<BoundValue>>()
+            new Function<>()
             {
               @Override
               public Range<BoundValue> apply(BoundDimFilter bound)
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidSqlValidator.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidSqlValidator.java
index 797b5397f1d7..66d66174cc52 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidSqlValidator.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidSqlValidator.java
@@ -951,8 +951,10 @@ private static boolean containsCall(SqlNode node,
   {
     try {
       SqlVisitor<Void> visitor =
-          new SqlBasicVisitor<Void>() {
-            @Override public Void visit(SqlCall call)
+          new SqlBasicVisitor<>()
+          {
+            @Override
+            public Void visit(SqlCall call)
             {
               if (callPredicate.test(call)) {
                 throw new Util.FoundOne(call);
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
index 8481efdbcbd1..844a06d862d6 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
@@ -343,7 +343,7 @@ private PlannerResult planWithBindableConvention()
                   @Override
                   public QueryHandler.EnumeratorIterator<Object[]> make()
                   {
-                    return new QueryHandler.EnumeratorIterator<>(new Iterator<Object[]>()
+                    return new QueryHandler.EnumeratorIterator<>(new Iterator<>()
                     {
                       @Override
                       public boolean hasNext()
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidUnionRel.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidUnionRel.java
index 17fcbd6bfc37..5a91a5a6a2fe 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidUnionRel.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidUnionRel.java
@@ -111,7 +111,7 @@ public QueryResponse<Object[]> runQuery()
   {
     // Lazy: run each query in sequence, not all at once.
     if (limit == 0) {
-      return new QueryResponse<Object[]>(Sequences.empty(), ResponseContext.createEmpty());
+      return new QueryResponse<>(Sequences.empty(), ResponseContext.createEmpty());
     } else {
 
       // We run the first rel here for two reasons:
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java
index 8d6230afcc8f..c4cf6150d63d 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java
@@ -452,7 +452,7 @@ public static ConditionAnalysis analyzeCondition(
     final List<RexNode> unSupportedSubConditions = new ArrayList<>();
     final Set<RexInputRef> rightColumns = new HashSet<>();
     final int numLeftFields = leftRowType.getFieldCount();
-    final List<String> errors = new ArrayList<String>();
+    final List<String> errors = new ArrayList<>();
 
     for (RexNode subCondition : subConditions) {
       if (RexUtil.isLiteral(subCondition, true)) {
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
index f564d23413a6..a9e3d2e31d2c 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
@@ -186,7 +186,7 @@ public Enumerable<Object[]> scan(final DataContext root)
       final FluentIterable<Object[]> results = FluentIterable
           .from(rootSchema.getSubSchemaNames())
           .transform(
-              new Function<String, Object[]>()
+              new Function<>()
               {
                 @Override
                 public Object[] apply(final String schemaName)
@@ -282,7 +282,7 @@ public Iterable<Object[]> apply(final String schemaName)
                               }
                           ),
                           FluentIterable.from(authorizedFunctionNames).transform(
-                              new Function<String, Object[]>()
+                              new Function<>()
                               {
                                 @Override
                                 public Object[] apply(final String functionName)
@@ -364,7 +364,7 @@ public Iterable<Object[]> apply(final String schemaName)
                       Iterables.filter(
                           Iterables.concat(
                               FluentIterable.from(authorizedTableNames).transform(
-                                  new Function<String, Iterable<Object[]>>()
+                                  new Function<>()
                                   {
                                     @Override
                                     public Iterable<Object[]> apply(final String tableName)
@@ -384,7 +384,7 @@ public Iterable<Object[]> apply(final String tableName)
                                   }
                               ),
                               FluentIterable.from(authorizedFunctionNames).transform(
-                                  new Function<String, Iterable<Object[]>>()
+                                  new Function<>()
                                   {
                                     @Override
                                     public Iterable<Object[]> apply(final String functionName)
@@ -449,7 +449,7 @@ private Iterable<Object[]> generateColumnMetadata(
       return FluentIterable
           .from(tableSchema.getFieldList())
           .transform(
-              new Function<RelDataTypeField, Object[]>()
+              new Function<>()
               {
                 @Override
                 public Object[] apply(final RelDataTypeField field)
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/MetadataSegmentView.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/MetadataSegmentView.java
index 89280252bc66..738c497caa05 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/schema/MetadataSegmentView.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/MetadataSegmentView.java
@@ -210,9 +210,7 @@ private JsonParserIterator<SegmentStatusInCluster> getMetadataSegments(
 
     return SystemSchema.getThingsFromLeaderNode(
         queryBuilder.toString(),
-        new TypeReference<SegmentStatusInCluster>()
-        {
-        },
+        new TypeReference<>() {},
         coordinatorClient,
         jsonMapper
     );
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/SystemSchema.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/SystemSchema.java
index 0af8c19ca064..0551480125c1 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/schema/SystemSchema.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/SystemSchema.java
@@ -840,7 +840,7 @@ public Iterator<Object[]> iterator()
         @Override
         public Enumerator<Object[]> enumerator()
         {
-          return new Enumerator<Object[]>()
+          return new Enumerator<>()
           {
             @Override
             public Object[] current()
@@ -970,7 +970,7 @@ public Iterator<Object[]> iterator()
         @Override
         public Enumerator<Object[]> enumerator()
         {
-          return new Enumerator<Object[]>()
+          return new Enumerator<>()
           {
             @Override
             public Object[] current()
@@ -1087,7 +1087,7 @@ public static <T> JsonParserIterator<T> getThingsFromLeaderNode(
 
   private static <T> CloseableIterator<T> wrap(Iterator<T> iterator, Closeable closer)
   {
-    return new CloseableIterator<T>()
+    return new CloseableIterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/sql/src/test/java/org/apache/druid/quidem/DruidQuidemTestBase.java b/sql/src/test/java/org/apache/druid/quidem/DruidQuidemTestBase.java
index 8c8d50fba475..0bd8ed4b48af 100644
--- a/sql/src/test/java/org/apache/druid/quidem/DruidQuidemTestBase.java
+++ b/sql/src/test/java/org/apache/druid/quidem/DruidQuidemTestBase.java
@@ -181,7 +181,7 @@ public static boolean isOverwrite()
 
   protected final List<String> getFileNames() throws IOException
   {
-    List<String> ret = new ArrayList<String>();
+    List<String> ret = new ArrayList<>();
 
     File testRoot = getTestRoot();
     if (!testRoot.exists()) {
diff --git a/sql/src/test/java/org/apache/druid/quidem/DynamicComposite.java b/sql/src/test/java/org/apache/druid/quidem/DynamicComposite.java
index 290e972761ee..e67c0178c05c 100644
--- a/sql/src/test/java/org/apache/druid/quidem/DynamicComposite.java
+++ b/sql/src/test/java/org/apache/druid/quidem/DynamicComposite.java
@@ -34,7 +34,7 @@ public static <T, E> T make(T base, Class<T> baseClass, E ext, Class<E> extClass
     return (T) Proxy.newProxyInstance(
         base.getClass().getClassLoader(),
         new Class[] {baseClass, extClass},
-        new DynamicComposite<T, E>(base, ext, extClass)
+        new DynamicComposite<>(base, ext, extClass)
     );
   }
 
diff --git a/sql/src/test/java/org/apache/druid/quidem/DynamicCompositeTest.java b/sql/src/test/java/org/apache/druid/quidem/DynamicCompositeTest.java
index b8fb71f6acae..b837650aa4ed 100644
--- a/sql/src/test/java/org/apache/druid/quidem/DynamicCompositeTest.java
+++ b/sql/src/test/java/org/apache/druid/quidem/DynamicCompositeTest.java
@@ -33,7 +33,7 @@ public class DynamicCompositeTest
   @Test
   public void testCompose()
   {
-    HashSet<Integer> set = new HashSet<Integer>();
+    HashSet<Integer> set = new HashSet<>();
     Function<Integer, Integer> sq = x -> x * x;
     Set<Integer> composite = DynamicComposite.make(set, Set.class, sq, Function.class);
     composite.add(1);
diff --git a/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java b/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java
index 32c873c0fe10..e924102284f3 100644
--- a/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java
@@ -115,7 +115,7 @@ public <T> Sequence<T> run(Query<?> query, Sequence<T> resultSequence)
       {
         return super.run(
             query,
-            new LazySequence<T>(() -> resultSequence)
+            new LazySequence<>(() -> resultSequence)
         );
       }
     };
diff --git a/sql/src/test/java/org/apache/druid/sql/avatica/AvaticaModuleTest.java b/sql/src/test/java/org/apache/druid/sql/avatica/AvaticaModuleTest.java
index 2c10994c4a37..1918736af32f 100644
--- a/sql/src/test/java/org/apache/druid/sql/avatica/AvaticaModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/avatica/AvaticaModuleTest.java
@@ -94,7 +94,7 @@ public void testAvaticaMonitorIsInjectedAsSingleton()
   public void testAvaticaMonitorIsRegisterdWithMetricsModule()
   {
     Set<Class<? extends Monitor>> monitors =
-        injector.getInstance(Key.get(new TypeLiteral<Set<Class<? extends Monitor>>>(){}));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertTrue(monitors.contains(AvaticaMonitor.class));
   }
 
@@ -197,15 +197,14 @@ public void testDruidAvaticaProtobufHandlerIsInjected()
   public void testDruidAvaticaJsonHandlerIsRegisterdWithJerseyModule()
   {
     Set<Handler> handlers =
-        injector.getInstance(Key.get(new TypeLiteral<Set<Handler>>(){}));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertTrue(handlers.stream().anyMatch(h -> DruidAvaticaJsonHandler.class.equals(h.getClass())));
   }
 
   @Test
   public void testDruidAvaticaProtobufHandlerIsRegisterdWithJerseyModule()
   {
-    Set<Handler> handlers =
-            injector.getInstance(Key.get(new TypeLiteral<Set<Handler>>(){}));
+    Set<Handler> handlers = injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertTrue(handlers.stream().anyMatch(h -> DruidAvaticaProtobufHandler.class.equals(h.getClass())));
   }
 }
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
index de621ba3ee33..099d3e0254d1 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
@@ -1369,7 +1369,7 @@ public static <T> Query<?> recursivelyClearContext(final Query<T> query, ObjectM
   private static List<DataSource> recursivelyClearDatasource(final List<DataSource> dataSources,
       ObjectMapper queryJsonMapper)
   {
-    List<DataSource> ret = new ArrayList<DataSource>();
+    List<DataSource> ret = new ArrayList<>();
     for (DataSource dataSource : dataSources) {
       ret.add(recursivelyClearContext(dataSource, queryJsonMapper));
     }
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java
index 571ba3f1b798..6b64dff9fee9 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java
@@ -62,7 +62,7 @@ private Set<Method> getAnnotatedMethods()
 
   static class ReportEntry
   {
-    public static final Comparator<ReportEntry> CLASS_NCASES_MODE_COMPARATOR = new Comparator<ReportEntry>()
+    public static final Comparator<ReportEntry> CLASS_NCASES_MODE_COMPARATOR = new Comparator<>()
     {
       @Override
       public int compare(ReportEntry l, ReportEntry r)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java b/sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java
index 56ac2445d632..ded918d64d8c 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java
@@ -98,7 +98,7 @@ public class SqlTestFrameworkConfig
   @NumMergeBuffers(QueryStackTests.DEFAULT_NUM_MERGE_BUFFERS)
   public @interface NumMergeBuffers
   {
-    ConfigOptionProcessor<Integer> PROCESSOR = new ConfigOptionProcessor<Integer>(NumMergeBuffers.class)
+    ConfigOptionProcessor<Integer> PROCESSOR = new ConfigOptionProcessor<>(NumMergeBuffers.class)
     {
       @Override
       public Integer fromString(String str) throws NumberFormatException
@@ -115,7 +115,7 @@ public Integer fromString(String str) throws NumberFormatException
   @MinTopNThreshold(TopNQueryConfig.DEFAULT_MIN_TOPN_THRESHOLD)
   public @interface MinTopNThreshold
   {
-    ConfigOptionProcessor<Integer> PROCESSOR = new ConfigOptionProcessor<Integer>(MinTopNThreshold.class)
+    ConfigOptionProcessor<Integer> PROCESSOR = new ConfigOptionProcessor<>(MinTopNThreshold.class)
     {
       @Override
       public Integer fromString(String str) throws NumberFormatException
@@ -132,7 +132,7 @@ public Integer fromString(String str) throws NumberFormatException
   @ResultCache(ResultCacheMode.DISABLED)
   public @interface ResultCache
   {
-    ConfigOptionProcessor<ResultCacheMode> PROCESSOR = new ConfigOptionProcessor<ResultCacheMode>(ResultCache.class)
+    ConfigOptionProcessor<ResultCacheMode> PROCESSOR = new ConfigOptionProcessor<>(ResultCache.class)
     {
       @Override
       public ResultCacheMode fromString(String str)
@@ -152,7 +152,7 @@ public ResultCacheMode fromString(String str)
   @ComponentSupplier(StandardComponentSupplier.class)
   public @interface ComponentSupplier
   {
-    ConfigOptionProcessor<Class<? extends QueryComponentSupplier>> PROCESSOR = new ConfigOptionProcessor<Class<? extends QueryComponentSupplier>>(
+    ConfigOptionProcessor<Class<? extends QueryComponentSupplier>> PROCESSOR = new ConfigOptionProcessor<>(
         ComponentSupplier.class
     )
     {
@@ -323,7 +323,7 @@ public void setConfig(SqlTestFrameworkConfig config)
      */
     public String buildTestCaseName(ExtensionContext context)
     {
-      List<String> names = new ArrayList<String>();
+      List<String> names = new ArrayList<>();
       Pattern pattern = Pattern.compile("\\([^)]*\\)");
       // this will add all name pieces - except the "last" which would be the
       // Class level name
@@ -509,7 +509,7 @@ public final T fromMap(Map<String, String> map) throws Exception
 
   static LoadingCache<String, Set<Class<? extends QueryComponentSupplier>>> componentSupplierClassCache = CacheBuilder
       .newBuilder()
-      .build(new CacheLoader<String, Set<Class<? extends QueryComponentSupplier>>>()
+      .build(new CacheLoader<>()
       {
         @Override
         public Set<Class<? extends QueryComponentSupplier>> load(String pkg)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/aggregation/SqlAggregationModuleTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/aggregation/SqlAggregationModuleTest.java
index 599dd2fb2616..790c6eae3921 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/aggregation/SqlAggregationModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/aggregation/SqlAggregationModuleTest.java
@@ -52,7 +52,7 @@ public void setUp()
   @Test
   public void testDefaultSqlAggregatorsAreBound()
   {
-    Set<SqlAggregator> sqlAggregators = injector.getInstance(Key.get(new TypeLiteral<Set<SqlAggregator>>() {}));
+    Set<SqlAggregator> sqlAggregators = injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertNotNull(sqlAggregators);
     Assert.assertEquals(2, sqlAggregators.size());
 
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
index 0616dd2a3a34..c419d04d92cc 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
@@ -168,7 +168,7 @@ public void testSystemSqlSchemaIsInjectedAsSingleton()
   @Test
   public void testDruidCalciteSchemasAreInjected()
   {
-    Set<NamedSchema> sqlSchemas = injector.getInstance(Key.get(new TypeLiteral<Set<NamedSchema>>(){}));
+    Set<NamedSchema> sqlSchemas = injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Set<Class<? extends NamedSchema>> expectedSchemas =
         ImmutableSet.of(NamedSystemSchema.class, NamedDruidSchema.class, NamedLookupSchema.class, NamedViewSchema.class);
     Assert.assertEquals(expectedSchemas.size(), sqlSchemas.size());
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
index 05c267a00bbe..04845efa1652 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
@@ -425,7 +425,7 @@ public ListenableFuture<CloseableIterator<TaskStatusPlus>> taskStatuses(
           @Nullable Integer maxCompletedTasks
       )
       {
-        List<TaskStatusPlus> tasks = new ArrayList<TaskStatusPlus>();
+        List<TaskStatusPlus> tasks = new ArrayList<>();
         tasks.add(createTaskStatus("id1", DATASOURCE1, 10L));
         tasks.add(createTaskStatus("id1", DATASOURCE1, 1L));
         tasks.add(createTaskStatus("id2", DATASOURCE2, 20L));
diff --git a/sql/src/test/java/org/apache/druid/sql/http/SqlHttpModuleTest.java b/sql/src/test/java/org/apache/druid/sql/http/SqlHttpModuleTest.java
index 6916358cb5b8..ff9c41eab9a1 100644
--- a/sql/src/test/java/org/apache/druid/sql/http/SqlHttpModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/http/SqlHttpModuleTest.java
@@ -90,9 +90,7 @@ public void testSqlResourceIsInjectedAndSingleton()
   public void testSqlResourceIsAvailableViaJersey()
   {
     Set<Class<?>> jerseyResourceClasses =
-        injector.getInstance(Key.get(new TypeLiteral<Set<Class<?>>>()
-        {
-        }, JSR311Resource.class));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}, JSR311Resource.class));
     Assert.assertEquals(1, jerseyResourceClasses.size());
     Assert.assertEquals(SqlResource.class, jerseyResourceClasses.iterator().next());
   }