(refactor) some opportunities to use diamond operator

client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/QueryDSLDocumentationTests.java

@@ -177,7 +177,7 @@ public void testGeoDistance() {
 
     public void testGeoPolygon() {
         // tag::geo_polygon
-        List<GeoPoint> points = new ArrayList<GeoPoint>();           // <1>
+        List<GeoPoint> points = new ArrayList<>();           // <1>
         points.add(new GeoPoint(40, -70));
         points.add(new GeoPoint(30, -80));
         points.add(new GeoPoint(20, -90));

core/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java

@@ -39,7 +39,7 @@ public static <Response> TaskListener<Response> instance() {
         return (TaskListener<Response>) INSTANCE;
     }
 
-    private static final LoggingTaskListener<Object> INSTANCE = new LoggingTaskListener<Object>();
+    private static final LoggingTaskListener<Object> INSTANCE = new LoggingTaskListener<>();
 
     private LoggingTaskListener() {
     }

core/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java

@@ -169,7 +169,7 @@ public static DateTimeFormatter forFields(
         if (fields == null || fields.size() == 0) {
             throw new IllegalArgumentException("The fields must not be null or empty");
         }
-        Set<DateTimeFieldType> workingFields = new HashSet<DateTimeFieldType>(fields);
+        Set<DateTimeFieldType> workingFields = new HashSet<>(fields);
         int inputSize = workingFields.size();
         boolean reducedPrec = false;
         DateTimeFormatterBuilder bld = new DateTimeFormatterBuilder();

core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java

@@ -127,7 +127,7 @@ public void testSimpleSettings() {
 
     public void testSimpleMixedFeatures() {
         int numFeatures = randomIntBetween(1, Feature.values().length);
-        List<Feature> features = new ArrayList<Feature>(numFeatures);
+        List<Feature> features = new ArrayList<>(numFeatures);
         for (int i = 0; i < numFeatures; i++) {
             features.add(randomFrom(Feature.values()));
         }
@@ -156,7 +156,7 @@ public void testSimpleMixedFeatures() {
 
     public void testEmptyMixedFeatures() {
         int numFeatures = randomIntBetween(1, Feature.values().length);
-        List<Feature> features = new ArrayList<Feature>(numFeatures);
+        List<Feature> features = new ArrayList<>(numFeatures);
         for (int i = 0; i < numFeatures; i++) {
             features.add(randomFrom(Feature.values()));
         }

core/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java

@@ -37,7 +37,7 @@ public class KeyedLockTests extends ESTestCase {
     public void testIfMapEmptyAfterLotsOfAcquireAndReleases() throws InterruptedException {
         ConcurrentHashMap<String, Integer> counter = new ConcurrentHashMap<>();
         ConcurrentHashMap<String, AtomicInteger> safeCounter = new ConcurrentHashMap<>();
-        KeyedLock<String> connectionLock = new KeyedLock<String>(randomBoolean());
+        KeyedLock<String> connectionLock = new KeyedLock<>(randomBoolean());
         String[] names = new String[randomIntBetween(1, 40)];
         for (int i = 0; i < names.length; i++) {
             names[i] = randomRealisticUnicodeOfLengthBetween(10, 20);

core/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java

@@ -128,7 +128,7 @@ protected void sendRequest(Connection connection, long requestId, String action,
         refresh();
         SearchResponse searchResponse = client().prepareSearch("index").setSize(numDocs * 2).addStoredField("_id").get();
 
-        Set<String> uniqueIds = new HashSet();
+        Set<String> uniqueIds = new HashSete<>();
         long dupCounter = 0;
         boolean found_duplicate_already = false;
         for (int i = 0; i < searchResponse.getHits().getHits().length; i++) {

core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java

@@ -42,7 +42,7 @@ private SyncedFlushUtil() {
      */
     public static ShardsSyncedFlushResult attemptSyncedFlush(InternalTestCluster cluster, ShardId shardId) {
         SyncedFlushService service = cluster.getInstance(SyncedFlushService.class);
-        LatchedListener<ShardsSyncedFlushResult> listener = new LatchedListener();
+        LatchedListener<ShardsSyncedFlushResult> listener = new LatchedListener<>();
         service.attemptSyncedFlush(shardId, listener);
         try {
             listener.latch.await();

core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java

@@ -44,7 +44,7 @@ protected ScriptedMetricAggregationBuilder createTestAggregatorBuilder() {
             factory.reduceScript(randomScript("reduceScript"));
         }
         if (randomBoolean()) {
-            Map<String, Object> params = new HashMap<String, Object>();
+            Map<String, Object> params = new HashMap<>();
             params.put("foo", "bar");
             factory.params(params);
         }

core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java

@@ -265,7 +265,7 @@ public void testSingleValueAggDerivative() throws Exception {
         Object[] propertiesDocCounts = (Object[]) ((InternalAggregation)deriv).getProperty("_count");
         Object[] propertiesSumCounts = (Object[]) ((InternalAggregation)deriv).getProperty("sum.value");
 
-        List<Bucket> buckets = new ArrayList<Bucket>(deriv.getBuckets());
+        List<Bucket> buckets = new ArrayList<>(deriv.getBuckets());
         Long expectedSumPreviousBucket = Long.MIN_VALUE; // start value, gets
                                                          // overwritten
         for (int i = 0; i < numValueBuckets; ++i) {
@@ -311,7 +311,7 @@ public void testMultiValueAggDerivative() throws Exception {
         Object[] propertiesDocCounts = (Object[]) ((InternalAggregation)deriv).getProperty("_count");
         Object[] propertiesSumCounts = (Object[]) ((InternalAggregation)deriv).getProperty("stats.sum");
 
-        List<Bucket> buckets = new ArrayList<Bucket>(deriv.getBuckets());
+        List<Bucket> buckets = new ArrayList<>(deriv.getBuckets());
         Long expectedSumPreviousBucket = Long.MIN_VALUE; // start value, gets
                                                          // overwritten
         for (int i = 0; i < numValueBuckets; ++i) {

core/src/test/java/org/elasticsearch/search/query/ExistsIT.java

@@ -97,7 +97,7 @@ public void testExists() throws Exception {
                 // empty doc
                 emptyMap()
         };
-        List<IndexRequestBuilder> reqs = new ArrayList<IndexRequestBuilder>();
+        List<IndexRequestBuilder> reqs = new ArrayList<>();
         for (Map<String, Object> source : sources) {
             reqs.add(client().prepareIndex("idx", "type").setSource(source));
         }
@@ -106,7 +106,7 @@ public void testExists() throws Exception {
         // confuse the exists/missing parser at query time
         indexRandom(true, false, reqs);
 
-        final Map<String, Integer> expected = new LinkedHashMap<String, Integer>();
+        final Map<String, Integer> expected = new LinkedHashMap<>();
         expected.put("foo", 1);
         expected.put("f*", 1);
         expected.put("bar", 2);

core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java

@@ -183,7 +183,7 @@ public void testContextFilteringWorksWithUTF8Categories() throws Exception {
 
     public void testSingleContextFiltering() throws Exception {
         CategoryContextMapping contextMapping = ContextBuilder.category("cat").field("cat").build();
-        LinkedHashMap<String, ContextMapping> map = new LinkedHashMap<String, ContextMapping>(Collections.singletonMap("cat", contextMapping));
+        LinkedHashMap<String, ContextMapping> map = new LinkedHashMap<>(Collections.singletonMap("cat", contextMapping));
         final CompletionMappingBuilder mapping = new CompletionMappingBuilder().context(map);
         createIndexAndMapping(mapping);
         int numDocs = 10;
@@ -209,7 +209,7 @@ public void testSingleContextFiltering() throws Exception {
 
     public void testSingleContextBoosting() throws Exception {
         CategoryContextMapping contextMapping = ContextBuilder.category("cat").field("cat").build();
-        LinkedHashMap<String, ContextMapping> map = new LinkedHashMap<String, ContextMapping>(Collections.singletonMap("cat", contextMapping));
+        LinkedHashMap<String, ContextMapping> map = new LinkedHashMap<>(Collections.singletonMap("cat", contextMapping));
         final CompletionMappingBuilder mapping = new CompletionMappingBuilder().context(map);
         createIndexAndMapping(mapping);
         int numDocs = 10;
@@ -237,7 +237,7 @@ public void testSingleContextBoosting() throws Exception {
 
     public void testSingleContextMultipleContexts() throws Exception {
         CategoryContextMapping contextMapping = ContextBuilder.category("cat").field("cat").build();
-        LinkedHashMap<String, ContextMapping> map = new LinkedHashMap<String, ContextMapping>(Collections.singletonMap("cat", contextMapping));
+        LinkedHashMap<String, ContextMapping> map = new LinkedHashMap<>(Collections.singletonMap("cat", contextMapping));
         final CompletionMappingBuilder mapping = new CompletionMappingBuilder().context(map);
         createIndexAndMapping(mapping);
         int numDocs = 10;

modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java

@@ -119,7 +119,7 @@ public void testMegamorphic() throws Throwable {
         assertEquals(3, (int)handle.invokeExact((Object) Arrays.asList("x", "y", "z")));
         assertEquals(2, (int)handle.invokeExact((Object) Arrays.asList("u", "v")));
 
-        final HashMap<String,String> map = new HashMap<String,String>();
+        final HashMap<String,String> map = new HashMap<>();
         map.put("x", "y");
         map.put("a", "b");
         assertEquals(2, (int)handle.invokeExact((Object) map));

modules/reindex/src/main/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollAction.java

@@ -361,7 +361,7 @@ public void onFailure(Exception e) {
      */
     void onBulkResponse(TimeValue thisBatchStartTime, BulkResponse response) {
         try {
-            List<Failure> failures = new ArrayList<Failure>();
+            List<Failure> failures = new ArrayList<>();
             Set<String> destinationIndicesThisBatch = new HashSet<>();
             for (BulkItemResponse item : response) {
                 if (item.isFailed()) {

modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFailureTests.java

@@ -121,7 +121,7 @@ public void testResponseOnSearchFailure() throws Exception {
     }
 
     private void indexDocs(int count) throws Exception {
-        List<IndexRequestBuilder> docs = new ArrayList<IndexRequestBuilder>(count);
+        List<IndexRequestBuilder> docs = new ArrayList<>(count);
         for (int i = 0; i < count; i++) {
             docs.add(client().prepareIndex("source", "test", Integer.toString(i)).setSource("test", "words words"));
         }

plugins/analysis-kuromoji/src/main/java/org/elasticsearch/index/analysis/KuromojiPartOfSpeechFilterFactory.java

@@ -31,7 +31,7 @@
 
 public class KuromojiPartOfSpeechFilterFactory extends AbstractTokenFilterFactory {
 
-    private final Set<String> stopTags = new HashSet<String>();
+    private final Set<String> stopTags = new HashSet<>();
 
     public KuromojiPartOfSpeechFilterFactory(IndexSettings indexSettings, Environment env, String name, Settings settings) {
         super(indexSettings, name, settings);

plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java

@@ -110,7 +110,7 @@ public void delete(BlobPath path) {
             //we can do at most 1K objects per delete
             //We don't know the bucket name until first object listing
             DeleteObjectsRequest multiObjectDeleteRequest = null;
-            ArrayList<KeyVersion> keys = new ArrayList<KeyVersion>();
+            ArrayList<KeyVersion> keys = new ArrayList<>();
             while (true) {
                 ObjectListing list;
                 if (prevListing != null) {

plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AbstractS3SnapshotRestoreTest.java

@@ -452,7 +452,7 @@ public void cleanRepositoryFiles(String basePath) {
                 //we can do at most 1K objects per delete
                 //We don't know the bucket name until first object listing
                 DeleteObjectsRequest multiObjectDeleteRequest = null;
-                ArrayList<DeleteObjectsRequest.KeyVersion> keys = new ArrayList<DeleteObjectsRequest.KeyVersion>();
+                ArrayList<DeleteObjectsRequest.KeyVersion> keys = new ArrayList<>();
                 while (true) {
                     ObjectListing list;
                     if (prevListing != null) {

plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/TestAmazonS3.java

@@ -53,7 +53,7 @@ public class TestAmazonS3 extends AmazonS3Wrapper {
 
     private String randomPrefix;
 
-    ConcurrentMap<String, AtomicLong> accessCounts = new ConcurrentHashMap<String, AtomicLong>();
+    ConcurrentMap<String, AtomicLong> accessCounts = new ConcurrentHashMap<>();
 
     private long incrementAndGet(String path) {
         AtomicLong value = accessCounts.get(path);